Merge branch 'dev/20200522temp' into debug

# Conflicts:
#	src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

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

@@ -28,7 +28,6 @@ import com.diagbot.entity.HomeDiagnoseInfo;
 import com.diagbot.entity.HomeOperationInfo;
 import com.diagbot.entity.HomePage;
 import com.diagbot.entity.MedicalRecord;
-import com.diagbot.entity.SysUserDept;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -49,7 +48,6 @@ import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
 import com.diagbot.vo.ExportQcresultVO;
-import com.diagbot.vo.FilterVO;
 import com.diagbot.vo.GetDetailVO;
 import com.diagbot.vo.MedrecVo;
 import com.diagbot.vo.QcResultAlgQueryVO;
@@ -607,7 +605,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 if (map.containsKey(objKey)) {
                     if (firstPageDate.contains(objKey)) {
                         Date date = (Date) objectMap.get(objKey);
-                        content.put(map.get(objKey), DateUtil.formatDateTime(date).replaceAll("null", ""));
+                        if ("birthday".equals(objKey)) {
+                            content.put(map.get(objKey), DateUtil.formatDate(date));
+                        } else {
+                            content.put(map.get(objKey), DateUtil.formatDateTime(date));
+                        }
                     } else {
                         content.put(map.get(objKey), String.valueOf(objectMap.get(objKey)).replaceAll("null", ""));
                     }

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

@@ -92,15 +92,24 @@ public class QcAbnormalFacade extends QcAbnormalServiceImpl {
      * @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())
-        );
+
+        boolean res = false;
+            res = this.update(new UpdateWrapper<QcAbnormal>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                    .eq("type", 1)//异常类型(1:数据模块 2：质控类型 3：XML结构)
+                    .eq("description", qcAbnormalSaveNameVO.getDescription())
+                    .set("status", qcAbnormalSaveNameVO.getStatus())
+                    .set("gmt_modified", DateUtil.now())
+                    .set("modifier", SysUserUtils.getCurrentPrincipleID())
+            );
+            //最后更新备注
+            res = this.update(new UpdateWrapper<QcAbnormal>()
+                    .eq("id", qcAbnormalSaveNameVO.getId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("remark", qcAbnormalSaveNameVO.getRemark())
+            );
+        return res;
     }
 
 

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

@@ -14,6 +14,8 @@ import javax.validation.constraints.NotNull;
 @Setter
 @Getter
 public class QcAbnormalSaveNameVO {
+    @NotNull(message = "请输入Id")
+    private  Long id;
     @NotBlank(message = "请输入异常描述")
     private  String description;
     @NotNull(message = "请输入处理状态")