Merge remote-tracking branch 'origin/dev/20200522temp' into debug

src/main/java/com/diagbot/facade/ModelHospitalFacade.java

@@ -33,6 +33,8 @@ public class ModelHospitalFacade extends ModelHospitalServiceImpl {
     ModelHospitalService modelHospitalService;
     @Autowired
     MedicalRecordFacade medicalRecordFacade;
+    @Autowired
+    QcAbnormalFacade qcAbnormalFacade;
 
     /**
      *
@@ -90,6 +92,8 @@ public class ModelHospitalFacade extends ModelHospitalServiceImpl {
                         .set("mode_id", modelHospitals.getId())
                         .set("gmt_create",date);
                 medicalRecordFacade.update(medicalRecordData);
+                //更新异常数据状态
+                qcAbnormalFacade.saveQcAnnormalNameAll(modelHospitalUpdataVO.getQcAbnormalName());
             }
         }else {
             ModelHospital modelHospitalDatas = new ModelHospital();
@@ -105,6 +109,8 @@ public class ModelHospitalFacade extends ModelHospitalServiceImpl {
                         .set("mode_id", modelHospitalDatas.getId())
                         .set("gmt_create",date);
                 medicalRecordFacade.update(medicalRecordData);
+                //更新异常数据状态
+                qcAbnormalFacade.saveQcAnnormalNameAll(modelHospitalUpdataVO.getQcAbnormalName());
             }
         }
 

src/main/java/com/diagbot/facade/QcAbnormalFacade.java

@@ -9,6 +9,7 @@ import com.diagbot.service.impl.QcAbnormalServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.QcAbnormalDelVO;
+import com.diagbot.vo.QcAbnormalSaveNameVO;
 import com.diagbot.vo.QcAbnormalSaveVO;
 import com.diagbot.vo.QcAbnormalVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,4 +74,21 @@ public class QcAbnormalFacade extends QcAbnormalServiceImpl {
                 .set("modifier", SysUserUtils.getCurrentPrincipleID())
         );
     }
+    /**
+     * 根据异常异常描述和异常类型 更新所有异常异常描一样的数据。
+     *
+     * @param qcAbnormalSaveNameVO 异常数据监控信息更新参数
+     * @return 是否成功
+     */
+    public Boolean saveQcAnnormalNameAll(QcAbnormalSaveNameVO qcAbnormalSaveNameVO) {
+        return this.update(new UpdateWrapper<QcAbnormal>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .eq("description", qcAbnormalSaveNameVO.getDescription())
+                .set("status", qcAbnormalSaveNameVO.getStatus())
+                .set("remark", qcAbnormalSaveNameVO.getRemark())
+                .set("gmt_modified", DateUtil.now())
+                .set("modifier", SysUserUtils.getCurrentPrincipleID())
+        );
+    }
 }

src/main/java/com/diagbot/vo/ModelHospitalUpdataVO.java

@@ -3,6 +3,9 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author wangfeng
  * @Description:
@@ -12,18 +15,19 @@ import lombok.Setter;
 @Getter
 public class ModelHospitalUpdataVO {
 
-
     private Long id;
-
+    @NotNull(message = "请输入医院Id")
     private Long hospitalId;
-
+    @NotBlank(message = "请输入医院数据模块名")
     private String hospitalModelName;
-
+    @NotNull(message = "请输入数据模块Id")
     private Long standModelId;
-
+    @NotBlank(message = "请输入数据模块名")
     private String standModelName;
     /**
      * 备注
      */
     private String remark;
+
+    private QcAbnormalSaveNameVO qcAbnormalName;
 }

src/main/java/com/diagbot/vo/QcAbnormalSaveNameVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-05-27 13:49
+ */
+@Setter
+@Getter
+public class QcAbnormalSaveNameVO {
+    @NotBlank(message = "请输入异常描述")
+    private  String description;
+    @NotNull(message = "请输入处理状态")
+    private  Integer status;
+    private  String remark;
+
+}

src/main/java/com/diagbot/web/ModelHospitalController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -49,7 +50,7 @@ public class ModelHospitalController {
             notes = "根据id获取医院数据")
     @PostMapping("/getModelHospitalById")
     @SysLogger("getModelHospitalById")
-    public RespDTO<ModelHospitalAllDTO> getModelHospitalById(@RequestBody ModelHospitalIdVO modelHospitalIdVO) {
+    public RespDTO<ModelHospitalAllDTO> getModelHospitalById(@RequestBody @Valid ModelHospitalIdVO modelHospitalIdVO) {
         ModelHospitalAllDTO data = modelHospitalFacade.getModelHospitalById(modelHospitalIdVO.getModeId());
         return RespDTO.onSuc(data);
     }
@@ -57,7 +58,7 @@ public class ModelHospitalController {
             notes = "添加和修改医院数据模块")
     @PostMapping("/saveAndupdataModel")
     @SysLogger("saveAndupdataModel")
-    public RespDTO<Boolean> updataModelHospital(@RequestBody ModelHospitalUpdataVO modelHospitalUpdataVO) {
+    public RespDTO<Boolean> updataModelHospital(@RequestBody @Valid ModelHospitalUpdataVO modelHospitalUpdataVO) {
         Boolean res = modelHospitalFacade.updataModelHospitals(modelHospitalUpdataVO);
         return RespDTO.onSuc(res);
     }
@@ -66,7 +67,7 @@ public class ModelHospitalController {
             notes = "删除医院数据模块")
     @PostMapping("/clearModelHospital")
     @SysLogger("clearModelHospital")
-    public RespDTO<Boolean> clearModelHospital(@RequestBody ModelHospitalIdVO modelHospitalIdVO) {
+    public RespDTO<Boolean> clearModelHospital(@RequestBody @Valid ModelHospitalIdVO modelHospitalIdVO) {
         Boolean res = modelHospitalFacade.clearModelHospital(modelHospitalIdVO.getModeId());
         return RespDTO.onSuc(res);
     }