add 疼痛小管家

nb-auth/src/main/java/com/nb/auth/controller/vo/AccountInfoVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -52,7 +53,7 @@ public class AccountInfoVO<T> implements Serializable {
     /**
      * 性别 1男；2女；3未知
      */
-    @NotBlank(message = "性别不能为空")
+    @NotNull(message = "性别不能为空")
     private SexEnum sex;
 
     /**

nb-service-api/app-doctor-api/src/main/java/com/nb/app/doctor/api/entity/AppDoctorUserEntity.java

@@ -1,6 +1,9 @@
 package com.nb.app.doctor.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.nb.common.config.mybatisplus.TenantNameHandler;
 import com.nb.core.entity.TenantGenericEntity;
 import com.nb.core.enums.SexEnum;
@@ -32,6 +35,7 @@ public class AppDoctorUserEntity extends TenantGenericEntity<String,String> {
     @ApiModelProperty(value = "密码,密码不得超过32位")
     @Length(max = 32,message = "密码不得超过32位",groups = {Insert.class,Update.class})
     @TableField(updateStrategy = FieldStrategy.NEVER)
+    @JsonIgnoreProperties(allowSetters = true)
     private String password;
 
     @ApiModelProperty(value = "性别 1、男 2、女 3、未知",allowableValues = "1,2,3")

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusEvaluationEntity.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusEvaluationEntity.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.entity;
+package com.nb.web.api.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.math.BigDecimal;

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IClinicEvalClient.java

@@ -0,0 +1,33 @@
+package com.nb.web.api.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.nb.web.api.entity.BusEvaluationEntity;
+import com.nb.web.api.feign.query.EvalQuery;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName IClinicEvalClient.java
+ * @Description 临床评价
+ * @createTime 2022年08月10日 14:25:00
+ */
+public interface IClinicEvalClient {
+     /**
+      * 描述: 分页查询评价信息
+      * @author lifang
+      * @date 2022/8/10 14:27
+      * @param query
+      * @return IPage<BusEvaluationEntity>
+      */
+     IPage<BusEvaluationEntity> pageQuery(EvalQuery query) ;
+
+
+     /**
+      * 描述: 保存评价信息
+      * @author lifang
+      * @date 2022/8/10 14:27
+      * @param entity
+      * @return boolean
+      */
+     boolean save(BusEvaluationEntity entity) ;
+}

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IDeviceAlarmClient.java

@@ -1,8 +1,8 @@
 package com.nb.web.api.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.core.entity.QueryParamEntity;
 import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.feign.query.AlarmQuery;
 
 /**
  * @author lifang
@@ -17,8 +17,8 @@ public interface IDeviceAlarmClient {
      * 描述: 查询报警信息
      * @author lifang
      * @date 2022/8/10 14:10
-     * @param source
-     * @return boolean
+     * @param query
+     * @return IPage
      */
-    IPage<BusDeviceAlarmEntity> list(QueryParamEntity<BusDeviceAlarmEntity> source) ;
+    IPage<BusDeviceAlarmEntity> pageQuery(AlarmQuery query);
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/AlarmQuery.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/query/AlarmQuery.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.service.dto;
+package com.nb.web.api.feign.query;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.api.entity.BusDeviceAlarmEntity;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/EvalQuery.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/query/EvalQuery.java

@@ -1,7 +1,7 @@
-package com.nb.web.service.bus.service.dto;
+package com.nb.web.api.feign.query;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.web.service.bus.entity.BusEvaluationEntity;
+import com.nb.web.api.entity.BusEvaluationEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/AppDoctorMonitorController.java

@@ -1,44 +0,0 @@
-package com.nb.app.doctor.controller;
-
-import cn.hutool.json.JSONUtil;
-import com.nb.core.result.R;
-import com.nb.web.api.feign.IPatientClient;
-import com.nb.web.api.feign.query.PatientMonitorQuery;
-import com.nb.web.api.feign.result.PatientMonitorDetailResult;
-import com.nb.web.api.feign.result.PatientMonitorResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName AppDoctorUserController.java
- * @Description TODO
- * @createTime 2022年08月09日 21:37:00
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/app/monitor")
-@Api(tags = "输注监护")
-@Slf4j
-public class AppDoctorMonitorController {
-    private final IPatientClient patientClient;
-
-    @PostMapping("/no_page")
-    @ApiOperation(value = "输注监控列表")
-    public R<List<PatientMonitorResult>> selectPage(@RequestBody PatientMonitorQuery query) {
-        log.info("医生查看输注监控列表,【{}】", JSONUtil.toJsonStr(query));
-        return R.success(patientClient.selectAll(query));
-    }
-
-    @PostMapping("/{patientId}")
-    @ApiOperation(value = "查看病人当前监控详情")
-    public R<PatientMonitorDetailResult> monitor(@PathVariable("patientId") String patientId) {
-        return R.success(patientClient.lookPatientDetail(patientId));
-    }
-}

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/PatientMonitorController.java

@@ -0,0 +1,74 @@
+package com.nb.app.doctor.controller;
+
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.nb.core.entity.GenericEntity;
+import com.nb.core.result.R;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusEvaluationEntity;
+import com.nb.web.api.feign.IClinicEvalClient;
+import com.nb.web.api.feign.IDeviceAlarmClient;
+import com.nb.web.api.feign.IPatientClient;
+import com.nb.web.api.feign.query.AlarmQuery;
+import com.nb.web.api.feign.query.EvalQuery;
+import com.nb.web.api.feign.query.PatientMonitorQuery;
+import com.nb.web.api.feign.result.PatientMonitorDetailResult;
+import com.nb.web.api.feign.result.PatientMonitorResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AppDoctorUserController.java
+ * @Description TODO
+ * @createTime 2022年08月09日 21:37:00
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app")
+@Api(tags = "病人输注监护")
+@Slf4j
+public class PatientMonitorController {
+    private final IPatientClient patientClient;
+    private final IDeviceAlarmClient deviceAlarmClient;
+    private final IClinicEvalClient clinicEvalClient;
+
+    @PostMapping("/monitor/no_page")
+    @ApiOperation(value = "输注监控列表")
+    public R<List<PatientMonitorResult>> selectPage(@RequestBody PatientMonitorQuery query) {
+        log.info("医生查看输注监控列表,【{}】", JSONUtil.toJsonStr(query));
+        return R.success(patientClient.selectAll(query));
+    }
+
+    @PostMapping("/monitor/{patientId}")
+    @ApiOperation(value = "查看病人当前监控详情")
+    public R<PatientMonitorDetailResult> monitor(@PathVariable("patientId") String patientId) {
+        return R.success(patientClient.lookPatientDetail(patientId));
+    }
+
+    @PostMapping("/device/alarm/page")
+    @ApiOperation(value = "临床设备报警信息查询")
+    public R<IPage<BusDeviceAlarmEntity>> page(@RequestBody@Validated AlarmQuery query){
+        return R.success(deviceAlarmClient.pageQuery(query));
+    }
+
+    @PostMapping("/eval/page")
+    @ApiOperation(value = "评价(输注查询)查询")
+    public R<IPage<BusEvaluationEntity>> page(@RequestBody @Validated EvalQuery query){
+        return R.success(clinicEvalClient.pageQuery(query));
+    }
+
+
+    @PostMapping("/eval/add")
+    @ApiOperation(value = "新增评价数据")
+    public R add(@RequestBody @Validated(GenericEntity.Insert.class)BusEvaluationEntity payload) {
+        return clinicEvalClient.save(payload)?R.success(payload):R.fail("数据新增失败");
+    }
+}

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusAlarmController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.service.bus.controller.vo.CauseVo;
-import com.nb.web.service.bus.service.dto.AlarmQuery;
+import com.nb.web.api.feign.query.AlarmQuery;
 import com.nb.web.api.entity.BusDeviceAlarmEntity;
 import com.nb.web.service.bus.service.LocalBusDeviceAlarmService;
 import com.nb.common.crud.BaseService;

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusAppDoctorUserController.java

@@ -1,16 +1,11 @@
 package com.nb.web.service.bus.controller;
 
-import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.text.CharSequenceUtil;
-import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.app.doctor.api.entity.AppDoctorUserEntity;
 import com.nb.app.doctor.api.feign.IAppDoctorUserClient;
 import com.nb.auth.utils.SecurityUtil;
-import com.nb.common.crud.BaseService;
-import com.nb.common.crud.controller.BaseDeleteController;
 import com.nb.core.annotation.Log;
 import com.nb.core.entity.QueryParamEntity;
 import com.nb.core.exception.CustomException;
@@ -42,7 +37,7 @@ public class BusAppDoctorUserController {
 
     @PostMapping("/page")
     @SaCheckPermission("bus:doctor:query")
-    @ApiOperation(value = "使用POST方式分页动态查询,权限 【bus:doctor:query】")
+    @ApiOperation(value = "使用POST方式分页动态查询",notes = "权限 【bus:doctor:query】")
     public R<IPage<AppDoctorUserEntity>> page(@RequestBody QueryParamEntity<AppDoctorUserEntity> query) {
         return R.success(this.appDoctorUserClient.list(query));
     }
@@ -59,7 +54,7 @@ public class BusAppDoctorUserController {
             @ApiImplicitParam(name = "id",value = "主键id",required = true)
     })
     @SaCheckPermission("bus:doctor:remove")
-    @ApiOperation(value = "根据ID删除 权限【bus:doctor:remove】")
+    @ApiOperation(value = "根据ID删除",notes = "权限【bus:doctor:remove】")
     public R delete(@RequestParam("id") String id) {
         if(CharSequenceUtil.isNullOrUndefined(String.valueOf(id))){
             return R.success();

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusClinicController.java

@@ -7,9 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.web.api.entity.BusClinicEntity;
-import com.nb.web.api.entity.BusDeviceHistoryEntity;
-import com.nb.web.api.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.*;
 import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
 import com.nb.web.service.bus.controller.vo.ClinicEditVo;
 import com.nb.web.service.bus.controller.vo.VisitRecord;
@@ -20,7 +18,6 @@ import com.nb.core.annotation.Log;
 import com.nb.core.entity.GenericEntity;
 import com.nb.core.exception.CustomException;
 import com.nb.core.result.R;
-import com.nb.web.api.entity.BusDeviceEntity;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusEvaluationController.java

@@ -3,9 +3,9 @@ package com.nb.web.service.bus.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.web.service.bus.entity.BusEvaluationEntity;
+import com.nb.web.api.entity.BusEvaluationEntity;
 import com.nb.web.service.bus.service.LocalBusEvaluationService;
-import com.nb.web.service.bus.service.dto.EvalQuery;
+import com.nb.web.api.feign.query.EvalQuery;
 import com.nb.common.crud.BaseService;
 import com.nb.common.crud.controller.BaseCrudController;
 import com.nb.core.result.R;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusDeviceAlarmMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.feign.query.AlarmQuery;
 import com.nb.web.service.bus.service.dto.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusEvaluationMapper.java

@@ -3,8 +3,8 @@ package com.nb.web.service.bus.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.web.service.bus.entity.BusEvaluationEntity;
-import com.nb.web.service.bus.service.dto.EvalQuery;
+import com.nb.web.api.entity.BusEvaluationEntity;
+import com.nb.web.api.feign.query.EvalQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceAlarmService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.api.entity.BusDeviceAlarmEntity;
 import com.nb.web.api.feign.IDeviceAlarmClient;
+import com.nb.web.api.feign.query.AlarmQuery;
 import com.nb.web.service.bus.entity.BusHospitalEntity;
 import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.api.enums.DeviceAlarmEnum;
@@ -113,6 +114,7 @@ public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper
 
     }
 
+    @Override
     public IPage<BusDeviceAlarmEntity> pageQuery(AlarmQuery query){
         return this.baseMapper.pageQuery(query.getPage(),query);
     }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusEvaluationService.java

@@ -5,9 +5,10 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.api.entity.BusClinicEntity;
-import com.nb.web.service.bus.entity.BusEvaluationEntity;
+import com.nb.web.api.entity.BusEvaluationEntity;
+import com.nb.web.api.feign.IClinicEvalClient;
 import com.nb.web.service.bus.mapper.BusEvaluationMapper;
-import com.nb.web.service.bus.service.dto.EvalQuery;
+import com.nb.web.api.feign.query.EvalQuery;
 import com.nb.web.service.bus.utils.WsPublishUtils;
 import com.nb.common.crud.BaseService;
 import com.nb.core.exception.CustomException;
@@ -26,7 +27,7 @@ import java.util.Optional;
  * @createTime 2022年03月19日 09:27:00
  */
 @Service
-public class LocalBusEvaluationService extends BaseService<BusEvaluationMapper, BusEvaluationEntity,String> {
+public class LocalBusEvaluationService extends BaseService<BusEvaluationMapper, BusEvaluationEntity,String> implements IClinicEvalClient {
 
     @Autowired
     @Lazy
@@ -36,6 +37,7 @@ public class LocalBusEvaluationService extends BaseService<BusEvaluationMapper,
     @Lazy
     private WsPublishUtils wsPublishUtils;
 
+    @Override
     public IPage<BusEvaluationEntity> pageQuery(EvalQuery query) {
         return this.baseMapper.pageQuery(query.getPage(),query);
     }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalRecordResult.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.service.dto;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.nb.web.api.entity.BusDeviceHistoryEntity;
-import com.nb.web.service.bus.entity.BusEvaluationEntity;
+import com.nb.web.api.entity.BusEvaluationEntity;
 import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusInfusionModifyEntity;
 import io.swagger.annotations.ApiModel;

nb-service/web-service/src/main/resources/mapper/bus/BusDeviceAlarmMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nb.web.service.bus.mapper.BusDeviceAlarmMapper">
 
-    <select id="pageQuery" parameterType="com.nb.web.service.bus.service.dto.AlarmQuery" resultType="com.nb.web.api.entity.BusDeviceAlarmEntity">
+    <select id="pageQuery" parameterType="com.nb.web.api.feign.query.AlarmQuery" resultType="com.nb.web.api.entity.BusDeviceAlarmEntity">
         select a.* from
         (select * from bus_device_alarm
         <where>

nb-service/web-service/src/main/resources/mapper/bus/BusEvaluationMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.nb.web.service.bus.mapper.BusEvaluationMapper">
 
 
-    <select id="pageQuery" parameterType="com.nb.web.service.bus.service.dto.EvalQuery" resultType="com.nb.web.service.bus.entity.BusEvaluationEntity">
+    <select id="pageQuery" parameterType="com.nb.web.api.feign.query.EvalQuery" resultType="com.nb.web.api.entity.BusEvaluationEntity">
         select e.* from
          bus_evaluation  as e
         join (select * from bus_infusion_history