增加日志，调整删除接口

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -144,6 +144,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendHomeDiagnose").permitAll()
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()
                 .antMatchers("/qc/data/sendCrisis").permitAll()
+                .antMatchers("/qc/data/deleteFlag").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -173,6 +173,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendHomeDiagnose", request)
                 || matchers("/qc/data/sendHomeOperation", request)
                 || matchers("/qc/data/sendCrisis", request)
+                || matchers("/qc/data/deleteFlag", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/entity/MedAbnormalInfo.java

@@ -3,7 +3,6 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -25,6 +24,11 @@ public class MedAbnormalInfo implements Serializable {
     @TableId(value = "abnormal_id", type = IdType.AUTO)
     private Long abnormalId;
 
+    /**
+     * 模块名称
+     */
+    private String moduleName;
+
     /**
      * 入参
      */
@@ -72,6 +76,13 @@ public class MedAbnormalInfo implements Serializable {
     public void setAbnormalId(Long abnormalId) {
         this.abnormalId = abnormalId;
     }
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
     public String getParamIn() {
         return paramIn;
     }
@@ -133,6 +144,7 @@ public class MedAbnormalInfo implements Serializable {
     public String toString() {
         return "MedAbnormalInfo{" +
             "abnormalId=" + abnormalId +
+                ", moduleName=" + moduleName +
             ", paramIn=" + paramIn +
             ", paramOut=" + paramOut +
             ", ramark=" + ramark +

src/main/java/com/diagbot/facade/data/ABasDeptInfoFacade.java

@@ -1,15 +1,14 @@
 package com.diagbot.facade.data;
 
-import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABasDeptInfoDTO;
 import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.entity.MedAbnormalInfo;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.BasDeptInfoServiceImpl;
-import com.diagbot.util.*;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABasDeptInfoVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,22 +63,22 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
 
                 //循环验证数据有效性
                 for (BasDeptInfo basDeptInfo:basDeptInfoList) {
-                    if("".equals(basDeptInfo.getDeptId())) {
+                    if(StringUtil.isEmpty(basDeptInfo.getDeptId())) {
                         return RespDTO.onError("请输入科室编码!");
                     }else if(basDeptInfo.getHospitalId()==null){
                         return RespDTO.onError("请输入医院编码!");
-                    }else if("".equals(basDeptInfo.getDeptName())){
+                    }else if(StringUtil.isEmpty(basDeptInfo.getDeptName())){
                         return RespDTO.onError("请输入科室名称!");
                     }
                 }
                 execute(basDeptInfoList);
                 return RespDTO.onSuc(basDeptInfoDtoList);
             }else {
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -91,8 +90,7 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
             basDeptInfoList.stream().forEach(s -> {
                 BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
                         .eq("dept_id", s.getDeptId())
-                        .eq("hospital_id", s.getHospitalId())
-                        .eq("is_deleted",IsDeleteEnum.N));
+                        .eq("hospital_id", s.getHospitalId()));
                 if (basDeptInfo != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);
@@ -107,8 +105,9 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
             if(addE.size()>0){
                 basDeptInfoService.saveBatch(addE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息",JSON.toJSONString(basDeptInfoList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(basDeptInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息",JSON.toJSONString(basDeptInfoList),"",e.getMessage());
         }
     }
 }

src/main/java/com/diagbot/facade/data/ABasDoctorInfoFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.data.ABasDoctorInfoDTO;
 import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABasDoctorInfoVO;
 import com.google.common.collect.Lists;
@@ -59,7 +60,7 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
                 basDoctorDtoList=BeanUtil.listCopyTo(list,ABasDoctorInfoDTO.class);
                 //循环验证数据有效性
                 for (BasDoctorInfo basDoctorInfo:basDoctorInfoList) {
-                    if("".equals(basDoctorInfo.getDoctorId())) {
+                    if(StringUtil.isEmpty(basDoctorInfo.getDoctorId())) {
                         return RespDTO.onError("请输入医生编码!");
                     }else if(basDoctorInfo.getHospitalId()==null){
                         return RespDTO.onError("请输入医院编码!");
@@ -68,11 +69,11 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
                 execute(basDoctorInfoList);
                 return RespDTO.onSuc(basDoctorDtoList);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -99,8 +100,9 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
             if(addE.size()>0){
                 basDoctorInfoService.saveBatch(addE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息",JSON.toJSONString(basDoctorInfoList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(basDoctorInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息",JSON.toJSONString(basDoctorInfoList),"",e.getMessage());
         }
     }
 }

src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -96,13 +96,13 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
                 //循环验证数据有效性
                 for (BehospitalInfo behospitalInfo:behospitalInfoList) {
-                    if("".equals(behospitalInfo.getBehospitalCode())) {
+                    if(StringUtil.isEmpty(behospitalInfo.getBehospitalCode())) {
                         return RespDTO.onError("请输入病人住院编码!");
                     }else if(behospitalInfo.getHospitalId()==null){
                         return RespDTO.onError("请输入医院编码!");
-                    }else if("".equals(behospitalInfo.getBehDeptId())){
+                    }else if(StringUtil.isEmpty(behospitalInfo.getBehDeptId())){
                         return RespDTO.onError("请输入住院科室编码!");
-                    }else if("".equals(behospitalInfo.getBehDeptName())){
+                    }else if(StringUtil.isEmpty(behospitalInfo.getBehDeptName())){
                         return RespDTO.onError("请输入住院科室名称!");
                     }
                 }
@@ -110,11 +110,11 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 behospitalInfoDtoList = BeanUtil.listCopyTo(list, ABehospitalInfoDTO.class);
                 return RespDTO.onSuc(behospitalInfoDtoList);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -143,8 +143,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
             if(updateE.size()>0){
                 behospitalInfoService.updateBatchByKey(updateE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(behospitalInfoList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(behospitalInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(behospitalInfoList),"",e.getMessage());
         }
     }
 
@@ -155,57 +156,69 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
      */
     private Long initQcTypeId(BehospitalInfo s){
         Long qcTypeId=Long.valueOf("0");
-        MedicalRecord medicalRecord = aMedicalRecordFacade.getOne(new QueryWrapper<MedicalRecord>()
-                .eq("behospital_code", s.getBehospitalCode())
-                .eq("hospital_id", s.getHospitalId())
-                .eq("mode_id", Long.valueOf("1"))
-                .eq("is_deleted",IsDeleteEnum.N), false);
-        if(medicalRecord!=null){
-            QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
-                    .eq("name",medicalRecord.getRecTitle())
+        try {
+            MedicalRecord medicalRecord = aMedicalRecordFacade.getOne(new QueryWrapper<MedicalRecord>()
+                    .eq("behospital_code", s.getBehospitalCode())
                     .eq("hospital_id", s.getHospitalId())
+                    .eq("mode_id", Long.valueOf("1"))
                     .eq("is_deleted",IsDeleteEnum.N), false);
-            if(qcType!=null){
-                qcTypeId=qcType.getId();
-            }else{
-                //新增类型到qc_type表中
-                QcType qctype=new QcType();
-                qctype.setHospitalId(s.getHospitalId());
-                qctype.setName(medicalRecord.getRecTitle());
-                qctype.setGmtCreate(new Date());
-
-                Long id=qcTypeFacade.saveT(qctype);
-                qcTypeId=id;
-
-                //新增类型到监测表中
-                QcAbnormal qcAbnormal=new QcAbnormal();
-                qcAbnormal.setHospitalId(s.getHospitalId());
-                qcAbnormal.setBehospitalCode(s.getBehospitalCode());
-                qcAbnormal.setType(2);
-                qcAbnormal.setDescription(medicalRecord.getRecTitle());
-                qcAbnormal.setGmtCreate(new Date());
-                qcAbnormalFacade.getBaseMapper().insert(qcAbnormal);
+            if(medicalRecord!=null){
+                QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
+                        .eq("name",medicalRecord.getRecTitle())
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N), false);
+                if(qcType!=null){
+                    qcTypeId=qcType.getId();
+                }else{
+                    //新增类型到qc_type表中
+                    QcType qctype=new QcType();
+                    qctype.setHospitalId(s.getHospitalId());
+                    qctype.setName(medicalRecord.getRecTitle());
+                    qctype.setGmtCreate(new Date());
+
+                    Long id=qcTypeFacade.saveT(qctype);
+                    qcTypeId=id;
+
+                    //新增类型到监测表中
+                    QcAbnormal qcAbnormal=new QcAbnormal();
+                    qcAbnormal.setHospitalId(s.getHospitalId());
+                    qcAbnormal.setBehospitalCode(s.getBehospitalCode());
+                    qcAbnormal.setType(2);
+                    qcAbnormal.setDescription(medicalRecord.getRecTitle());
+                    qcAbnormal.setGmtCreate(new Date());
+                    qcAbnormalFacade.getBaseMapper().insert(qcAbnormal);
+                }
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-qctypeid初始化",JSON.toJSONString(s),qcTypeId.toString(),"操作正常!");
+            return qcTypeId;
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-qctypeid初始化异常",JSON.toJSONString(s),"",e.getMessage());
+            return qcTypeId;
         }
-        return qcTypeId;
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
-            return RespDTO.onError("请输入病人住院编码!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("请输入医院编码!");
-        }else {
-            UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
-
-            Boolean flag=update(new BehospitalInfo(),updateWrapper);
-            return RespDTO.onSuc(flag);
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new BehospitalInfo(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除",JSON.toJSONString(aDeleteFlagVO),"","删除成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java

@@ -85,11 +85,11 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 doctorAdviceDtoList=BeanUtil.listCopyTo(list,ADoctorAdviceDTO.class);
                 return RespDTO.onSuc(doctorAdviceDtoList);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -119,19 +119,20 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
             if(updateE.size()>0){
                 doctorAdviceService.updateBatchByKey(updateE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(doctorAdviceList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(doctorAdviceList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(doctorAdviceList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isNotBlank(aDeleteFlagVO.getDoctorAdviceId())) {
+            if(StringUtil.isEmpty(aDeleteFlagVO.getDoctorAdviceId())) {
                 return RespDTO.onError("请输入病人医嘱编码!");
             }else if(aDeleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("请输入医院编码!");
-            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
                 return RespDTO.onError("请输入病人住院编码!");
             }else {
                 UpdateWrapper<DoctorAdvice> updateWrapper=new UpdateWrapper<>();
@@ -143,10 +144,11 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new DoctorAdvice(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java

@@ -61,11 +61,11 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                 execute(homeDiagnoseList);
                 return RespDTO.onSuc(homeDiagnoseDtoList);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -97,8 +97,9 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
             if(updateE.size()>0){
                 homeDiagnoseInfoService.updateBatchByKey(updateE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(homeDiagnoseList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
         }
 
     }
@@ -106,11 +107,11 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
                 return RespDTO.onError("出院诊断未输入病案首页编号!");
             }else if(aDeleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("出院诊断未输入医院编码!");
-            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getDiagnoseOrderNo())){
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getDiagnoseOrderNo())){
                 return RespDTO.onError("出院诊断未输入顺序号!");
             }else {
                 UpdateWrapper<HomeDiagnoseInfo> updateWrapper=new UpdateWrapper<>();
@@ -122,10 +123,11 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new HomeDiagnoseInfo(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java

@@ -94,19 +94,20 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
             if(updateE.size()>0){
                 homeOperationInfoService.updateBatchByKey(updateE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术",JSON.toJSONString(homeOperationList),"","操作正常!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(homeOperationList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术",JSON.toJSONString(homeOperationList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
                 return RespDTO.onError("住院手术未输入病案首页编号!");
             }else if(aDeleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("住院手术未输入医院编码!");
-            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getOperationOrderNo())){
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getOperationOrderNo())){
                 return RespDTO.onError("住院手术未输入顺序号!");
             }else {
                 UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();
@@ -118,10 +119,11 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new HomeOperationInfo(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -128,11 +128,11 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 //评分后返回结构体
                 return homePageIng(aHomePageIngVO);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aHomePageIngVO),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -156,8 +156,9 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 aHomeOperationInfoFacade.executeHomeOperation(s.getOperations());//首页手术
             });
             execute(homePageList);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
         }
     }
 
@@ -175,12 +176,14 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 Map<String,Object> map=new HashMap<String,Object>();
                 List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
                 map.put("homePages",homePageDtoList);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作成功!");
                 return RespDTO.onSuc(map);
             }else if(aHomePageIngVO.getDockModeType().equals("1")){
                 //页面模式
                 String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
                 Map<String,Object> map=new HashMap<String,Object>();
                 map.put("url",url);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作成功!");
                 return RespDTO.onSuc(map);
             }else if(aHomePageIngVO.getDockModeType().equals("2")){
                 AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
@@ -192,6 +195,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 if(analyzeRunDTO.getMsgDTOList().size()>0){
                     map.put("analyze",analyzeRunDTO.getMsgDTOList());
                 }
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作成功!");
                 return RespDTO.onSuc(map);
             }else{
                 //页面模式+接口引擎模式
@@ -207,10 +211,11 @@ public class AHomePageFacade extends HomePageServiceImpl{
                     map.put("url",url);
                     map.put("analyze",analyzeRunDTO.getMsgDTOList());
                 }
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作成功!");
                 return RespDTO.onSuc(map);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -250,11 +255,11 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(list,AHomePageDTO.class);
                 return RespDTO.onSuc(homePageDtoList);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -288,33 +293,35 @@ public class AHomePageFacade extends HomePageServiceImpl{
             if(updateE.size()>0){
                 homePageService.updateBatchByKey(updateE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(homePageList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(homePageList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(homePageList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
                 return RespDTO.onError("请输入病案首页编号!");
             }else if(aDeleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("请输入医院编码!");
-            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
                 return RespDTO.onError("请输入病人住院编码!");
             }else {
                 UpdateWrapper<HomePage> updateWrapper=new UpdateWrapper<>();
                 updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
                         .eq("is_deleted",IsDeleteEnum.N)
                         .set("is_deleted",IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
                 Boolean flag=update(new HomePage(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

src/main/java/com/diagbot/facade/data/AMedAbnormalInfoFacade.java

@@ -14,8 +14,9 @@ public class AMedAbnormalInfoFacade extends MedAbnormalInfoServiceImpl {
      * @param paramOut
      * @param remark
      */
-    public void saveAbnormalInfo(String paramIn,String paramOut,String remark){
+    public void saveAbnormalInfo(String moduleName,String paramIn,String paramOut,String remark){
         MedAbnormalInfo medAbnormalInfo=new MedAbnormalInfo();
+        medAbnormalInfo.setModuleName(moduleName);
         medAbnormalInfo.setParamIn(paramIn);
         medAbnormalInfo.setParamOut(paramOut);
         medAbnormalInfo.setRamark(remark);

src/main/java/com/diagbot/facade/data/AMedCrisisFacade.java

@@ -60,11 +60,11 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
                 List<AMedCrisisDTO> medCrisisDtoList=BeanUtil.listCopyTo(list,AMedCrisisDTO.class);
                 return RespDTO.onSuc(medCrisisDtoList);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -95,17 +95,18 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
             if(updateE.size()>0){
                 medCrisisInfoService.updateBatchByKey(updateE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(medCrisisList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(medCrisisList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(medCrisisList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isNotBlank(aDeleteFlagVO.getRecId())){
+            if(StringUtil.isEmpty(aDeleteFlagVO.getRecId())){
                 return RespDTO.onError("请输入文书编码!");
-            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())) {
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())) {
                 return RespDTO.onError("请输入病人住院编码!");
             }else if(aDeleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("请输入医院编码!");
@@ -119,10 +120,11 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new MedCrisisInfo(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("危急值-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

src/main/java/com/diagbot/facade/data/AMedicalRecordContentFacade.java

@@ -57,11 +57,11 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
                 execute(mrContentList);
                 return RespDTO.onSuc(mrContentDtoList);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
 
@@ -92,15 +92,16 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
             if(updateE.size()>0){
                 medicalRecordContentService.updateBatchByKey(updateE);
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(mrContentList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(mrContentList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(mrContentList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
-            if (StringUtil.isNotBlank(aDeleteFlagVO.getRecId())) {
+            if (StringUtil.isEmpty(aDeleteFlagVO.getRecId())) {
                 return RespDTO.onError("请输入文书序号!");
             } else if (aDeleteFlagVO.getHospitalId() == null) {
                 return RespDTO.onError("请输入医院编码!");
@@ -108,16 +109,16 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
                 UpdateWrapper<MedicalRecordContent> updateWrapper=new UpdateWrapper<>();
                 updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
                         .eq("is_deleted",IsDeleteEnum.N)
                         .set("is_deleted",IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new MedicalRecordContent(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
@@ -75,32 +76,38 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
      * @return
      */
     public RespDTO<List<AMedicalRecordDTO>> executeMrRecord(List<AMedicalRecordVO> list) {
-        if(list!=null && list.size()>0) {
-            //循环验证数据有效性
-            for (AMedicalRecordVO aMedicalRecordVO : list) {
-                if ("".equals(aMedicalRecordVO.getRecId())) {
-                    return RespDTO.onError("请输入文书序号!");
-                } else if (aMedicalRecordVO.getHospitalId() == null) {
-                    return RespDTO.onError("请输入医院编码!");
-                } else if ("".equals(aMedicalRecordVO.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
+        try {
+            if(list!=null && list.size()>0) {
+                //循环验证数据有效性
+                for (AMedicalRecordVO aMedicalRecordVO : list) {
+                    if ("".equals(aMedicalRecordVO.getRecId())) {
+                        return RespDTO.onError("请输入文书序号!");
+                    } else if (aMedicalRecordVO.getHospitalId() == null) {
+                        return RespDTO.onError("请输入医院编码!");
+                    } else if ("".equals(aMedicalRecordVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
                 }
-            }
 
-            //装载数据
-            List<MedicalRecord> medicalRecordList = Lists.newArrayList();
-            list.stream().forEach(s->{
-                MedicalRecord medicalRecord=new MedicalRecord();
-                BeanUtil.copyProperties(s,medicalRecord);
-                medicalRecord.setRecDate(DateUtil.parseDateTime(s.getRecDate()));
-                medicalRecordList.add(medicalRecord);
-            });
-            execute(medicalRecordList);
-
-            List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(list, AMedicalRecordDTO.class);
-            return RespDTO.onSuc(medicalRecordDTOList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+                //装载数据
+                List<MedicalRecord> medicalRecordList = Lists.newArrayList();
+                list.stream().forEach(s->{
+                    MedicalRecord medicalRecord=new MedicalRecord();
+                    BeanUtil.copyProperties(s,medicalRecord);
+                    medicalRecord.setRecDate(DateUtil.parseDateTime(s.getRecDate()));
+                    medicalRecordList.add(medicalRecord);
+                });
+                execute(medicalRecordList);
+
+                List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(list, AMedicalRecordDTO.class);
+                return RespDTO.onSuc(medicalRecordDTOList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
@@ -110,37 +117,43 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
      * @return
      */
     public RespDTO<Map<String, Object>> executeMrRecordIng(AMrContentVO aMrContentVO) {
-        if(aMrContentVO.getRecords()!=null && aMrContentVO.getRecords().size()>0){
-            AMrContentDTO aMrContentDTO=new AMrContentDTO();
-            //循环验证数据有效性
-            for (AMedicalRecordVO aMedicalRecordVO : aMrContentVO.getRecords()) {
-                if ("".equals(aMedicalRecordVO.getRecId())) {
-                    return RespDTO.onError("请输入文书序号!");
-                } else if (aMedicalRecordVO.getHospitalId() == null) {
-                    return RespDTO.onError("请输入医院编码!");
-                } else if ("".equals(aMedicalRecordVO.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
-                } else if ("".equals(aMedicalRecordVO.getRecTypeId())) {
-                    return RespDTO.onError("请输入病历类别编号!");
-                } else if ("".equals(aMedicalRecordVO.getRecTitle())) {
-                    return RespDTO.onError("请输入病历标题!");
-                } else if (aMedicalRecordVO.getContents() == null || aMedicalRecordVO.getContents().size() == 0) {
-                    return RespDTO.onError("请输入文书详情!");
+        try {
+            if(aMrContentVO.getRecords()!=null && aMrContentVO.getRecords().size()>0){
+                AMrContentDTO aMrContentDTO=new AMrContentDTO();
+                //循环验证数据有效性
+                for (AMedicalRecordVO aMedicalRecordVO : aMrContentVO.getRecords()) {
+                    if ("".equals(aMedicalRecordVO.getRecId())) {
+                        return RespDTO.onError("请输入文书序号!");
+                    } else if (aMedicalRecordVO.getHospitalId() == null) {
+                        return RespDTO.onError("请输入医院编码!");
+                    } else if ("".equals(aMedicalRecordVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    } else if ("".equals(aMedicalRecordVO.getRecTypeId())) {
+                        return RespDTO.onError("请输入病历类别编号!");
+                    } else if ("".equals(aMedicalRecordVO.getRecTitle())) {
+                        return RespDTO.onError("请输入病历标题!");
+                    } else if (aMedicalRecordVO.getContents() == null || aMedicalRecordVO.getContents().size() == 0) {
+                        return RespDTO.onError("请输入文书详情!");
+                    }
                 }
-            }
-            //更新文书信息
-            executeMrRecord(aMrContentVO.getRecords());
+                //更新文书信息
+                executeMrRecord(aMrContentVO.getRecords());
 
-            aMrContentVO.getRecords().stream().forEach(s -> {
-                //更新文书详情
-                aMedicalRecordContentFacade.executeMrRecordContent(s.getContents());
-            });
+                aMrContentVO.getRecords().stream().forEach(s -> {
+                    //更新文书详情
+                    aMedicalRecordContentFacade.executeMrRecordContent(s.getContents());
+                });
 
-            //评分后返回结构体
-            return mrIng(aMrContentVO);
+                //评分后返回结构体
+                return mrIng(aMrContentVO);
 
-        }else{
-            return RespDTO.onError("未接收到数据!");
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
@@ -150,138 +163,153 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
      * @return
      */
     private RespDTO<Map<String, Object>> mrIng(AMrContentVO aMrContentVO){
-        String behospitalCode =aMrContentVO.getRecords().get(0).getBehospitalCode();
-        Long hospitalId=aMrContentVO.getRecords().get(0).getHospitalId();
-        MedicalRecord medicalRecord=new MedicalRecord();
-        BeanUtil.copyProperties(aMrContentVO.getRecords().get(0),medicalRecord);
-        Long modeId=initModeId(medicalRecord);
-        if(aMrContentVO.getDockModeType().equals("0")){
-            Map<String,Object> map=new HashMap<String,Object>();
-            List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(aMrContentVO.getRecords(), AMedicalRecordDTO.class);
-            map.put("records",medicalRecordDTOList);
-            return RespDTO.onSuc(map);
-        }else if(aMrContentVO.getDockModeType().equals("1")){
-            if(modeId==0 || modeId==null){
-                return RespDTO.onError("无对应的文书类型");
-            }
-            //页面模式
-            String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
-            Map<String,Object> map=new HashMap<String,Object>();
-            map.put("url",url);
-            return RespDTO.onSuc(map);
-        }else if(aMrContentVO.getDockModeType().equals("2")){
-            AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
-            analyzeRunVO.setBehospitalCode(behospitalCode);
-            analyzeRunVO.setHospitalId(hospitalId);
-            analyzeRunVO.setModeId(modeId);
-            AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
-            Map<String,Object> map=new HashMap<String,Object>();
-            if(analyzeRunDTO.getMsgDTOList().size()>0){
-                map.put("analyze",analyzeRunDTO.getMsgDTOList());
-            }
-            //接口引擎模式
-            return RespDTO.onSuc(map);
-        }else{
-            if(modeId==0 || modeId==null){
-                return RespDTO.onError("无对应的文书类型");
-            }
-            //页面模式
-            String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
-
-            AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
-            analyzeRunVO.setBehospitalCode(behospitalCode);
-            analyzeRunVO.setHospitalId(hospitalId);
-            analyzeRunVO.setModeId(modeId);
-            AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
-            Map<String,Object> map=new HashMap<String,Object>();
-            if(analyzeRunDTO.getMsgDTOList().size()>0){
+        try {
+            String behospitalCode =aMrContentVO.getRecords().get(0).getBehospitalCode();
+            Long hospitalId=aMrContentVO.getRecords().get(0).getHospitalId();
+            MedicalRecord medicalRecord=new MedicalRecord();
+            BeanUtil.copyProperties(aMrContentVO.getRecords().get(0),medicalRecord);
+            Long modeId=initModeId(medicalRecord);
+            if(aMrContentVO.getDockModeType().equals("0")){
+                Map<String,Object> map=new HashMap<String,Object>();
+                List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(aMrContentVO.getRecords(), AMedicalRecordDTO.class);
+                map.put("records",medicalRecordDTOList);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作正常!");
+                return RespDTO.onSuc(map);
+            }else if(aMrContentVO.getDockModeType().equals("1")){
+                if(modeId==0 || modeId==null){
+                    return RespDTO.onError("无对应的文书类型");
+                }
+                //页面模式
+                String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
+                Map<String,Object> map=new HashMap<String,Object>();
                 map.put("url",url);
-                map.put("analyze",analyzeRunDTO.getMsgDTOList());
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作正常!");
+                return RespDTO.onSuc(map);
+            }else if(aMrContentVO.getDockModeType().equals("2")){
+                AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
+                analyzeRunVO.setBehospitalCode(behospitalCode);
+                analyzeRunVO.setHospitalId(hospitalId);
+                analyzeRunVO.setModeId(modeId);
+                AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
+                Map<String,Object> map=new HashMap<String,Object>();
+                if(analyzeRunDTO.getMsgDTOList().size()>0){
+                    map.put("analyze",analyzeRunDTO.getMsgDTOList());
+                }
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作正常!");
+                //接口引擎模式
+                return RespDTO.onSuc(map);
+            }else{
+                if(modeId==0 || modeId==null){
+                    return RespDTO.onError("无对应的文书类型");
+                }
+                //页面模式
+                String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
+
+                AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
+                analyzeRunVO.setBehospitalCode(behospitalCode);
+                analyzeRunVO.setHospitalId(hospitalId);
+                analyzeRunVO.setModeId(modeId);
+                AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
+                Map<String,Object> map=new HashMap<String,Object>();
+                if(analyzeRunDTO.getMsgDTOList().size()>0){
+                    map.put("url",url);
+                    map.put("analyze",analyzeRunDTO.getMsgDTOList());
+                }
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作正常!");
+                return RespDTO.onSuc(map);
             }
-            return RespDTO.onSuc(map);
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
+
     }
 
     public void execute(List<MedicalRecord> medicalRecordList){
-        List<MedicalRecord> addE = Lists.newLinkedList();
-        List<MedicalRecord> updateE = Lists.newLinkedList();
-        List<BehospitalInfo> behospitalInfoList=Lists.newLinkedList();
-        List<QcAbnormal> qcAbnormalList = Lists.newLinkedList();
-        if (medicalRecordList != null && medicalRecordList.size() > 0) {
-            medicalRecordList.stream().forEach(s -> {
-                //初始化mode_id
-                Long modeId=initModeId(s);
-                if(modeId==Long.valueOf("0")){
-                    //新增类型到监测表中
-                    QcAbnormal qcAbnormal=new QcAbnormal();
-                    qcAbnormal.setHospitalId(s.getHospitalId());
-                    qcAbnormal.setBehospitalCode(s.getBehospitalCode());
-                    qcAbnormal.setType(1);
-                    qcAbnormal.setDescription(s.getRecTitle());
-                    qcAbnormal.setGmtCreate(new Date());
-                    qcAbnormalList.add(qcAbnormal);
-                }else if(modeId==Long.valueOf("1")){
-
-                    BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
-                            .eq("behospital_code", s.getBehospitalCode())
-                            .eq("hospital_id", s.getHospitalId()), false);
-                    if(behospitalInfo!=null){
-                        //如果病人住院信息存在，更新对应的qc_type_id
-                        Long qcTypeId=Long.valueOf("0");
-                        QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
-                                .eq("name",s.getRecTitle())
+        try {
+            List<MedicalRecord> addE = Lists.newLinkedList();
+            List<MedicalRecord> updateE = Lists.newLinkedList();
+            List<BehospitalInfo> behospitalInfoList=Lists.newLinkedList();
+            List<QcAbnormal> qcAbnormalList = Lists.newLinkedList();
+            if (medicalRecordList != null && medicalRecordList.size() > 0) {
+                medicalRecordList.stream().forEach(s -> {
+                    //初始化mode_id
+                    Long modeId=initModeId(s);
+                    if(modeId==Long.valueOf("0")){
+                        //新增类型到监测表中
+                        QcAbnormal qcAbnormal=new QcAbnormal();
+                        qcAbnormal.setHospitalId(s.getHospitalId());
+                        qcAbnormal.setBehospitalCode(s.getBehospitalCode());
+                        qcAbnormal.setType(1);
+                        qcAbnormal.setDescription(s.getRecTitle());
+                        qcAbnormal.setGmtCreate(new Date());
+                        qcAbnormalList.add(qcAbnormal);
+                    }else if(modeId==Long.valueOf("1")){
+                        BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
+                                .eq("behospital_code", s.getBehospitalCode())
                                 .eq("hospital_id", s.getHospitalId())
                                 .eq("is_deleted",IsDeleteEnum.N), false);
-                        if(qcType!=null){
-                            behospitalInfo.setQcTypeId(qcType.getId());
-                        }else{
-                            //新增类型到qc_type表中
-                            QcType qctype=new QcType();
-                            qctype.setHospitalId(s.getHospitalId());
-                            qctype.setName(s.getRecTitle());
-                            qctype.setGmtCreate(new Date());
-
-                            Long id=qcTypeFacade.saveT(qctype);
-                            behospitalInfo.setQcTypeId(id);
-
-                            //新增类型到监测表中
-                            QcAbnormal qcAbnormal=new QcAbnormal();
-                            qcAbnormal.setHospitalId(s.getHospitalId());
-                            qcAbnormal.setBehospitalCode(s.getBehospitalCode());
-                            qcAbnormal.setType(2);
-                            qcAbnormal.setDescription(s.getRecTitle());
-                            qcAbnormal.setGmtCreate(new Date());
-                            qcAbnormalService.getBaseMapper().insert(qcAbnormal);
+                        if(behospitalInfo!=null){
+                            //如果病人住院信息存在，更新对应的qc_type_id
+                            Long qcTypeId=Long.valueOf("0");
+                            QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
+                                    .eq("name",s.getRecTitle())
+                                    .eq("hospital_id", s.getHospitalId())
+                                    .eq("is_deleted",IsDeleteEnum.N), false);
+                            if(qcType!=null){
+                                behospitalInfo.setQcTypeId(qcType.getId());
+                            }else{
+                                //新增类型到qc_type表中
+                                QcType qctype=new QcType();
+                                qctype.setHospitalId(s.getHospitalId());
+                                qctype.setName(s.getRecTitle());
+                                qctype.setGmtCreate(new Date());
+
+                                Long id=qcTypeFacade.saveT(qctype);
+                                behospitalInfo.setQcTypeId(id);
+
+                                //新增类型到监测表中
+                                QcAbnormal qcAbnormal=new QcAbnormal();
+                                qcAbnormal.setHospitalId(s.getHospitalId());
+                                qcAbnormal.setBehospitalCode(s.getBehospitalCode());
+                                qcAbnormal.setType(2);
+                                qcAbnormal.setDescription(s.getRecTitle());
+                                qcAbnormal.setGmtCreate(new Date());
+                                qcAbnormalService.getBaseMapper().insert(qcAbnormal);
+                            }
+                            behospitalInfoList.add(behospitalInfo);
                         }
-                        behospitalInfoList.add(behospitalInfo);
                     }
-                }
-                s.setModeId(modeId);
-                //新增或修改
-                MedicalRecord mRecord = this.getOne(new QueryWrapper<MedicalRecord>()
-                        .eq("rec_id", s.getRecId())
-                        .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code", s.getBehospitalCode()), false);
-                if (mRecord != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            medicalRecordService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            medicalRecordService.updateBatchByKey(updateE);
-        }
-        if(qcAbnormalList.size()>0){
-            qcAbnormalService.saveBatch(qcAbnormalList);
-        }
-        if(behospitalInfoList.size()>0){
-            behospitalInfoFacade.updateBatchByKey(behospitalInfoList);
+                    s.setModeId(modeId);
+                    //新增或修改
+                    MedicalRecord mRecord = this.getOne(new QueryWrapper<MedicalRecord>()
+                            .eq("rec_id", s.getRecId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("behospital_code", s.getBehospitalCode()), false);
+                    if (mRecord != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                medicalRecordService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                medicalRecordService.updateBatchByKey(updateE);
+            }
+            if(qcAbnormalList.size()>0){
+                qcAbnormalService.saveBatch(qcAbnormalList);
+            }
+            if(behospitalInfoList.size()>0){
+                behospitalInfoFacade.updateBatchByKey(behospitalInfoList);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(medicalRecordList),"","操作正常!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(medicalRecordList),"",e.getMessage());
         }
     }
 
@@ -293,47 +321,61 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
      */
     private Long initModeId(MedicalRecord medicalRecord){
         Long modeId=Long.valueOf("0");
-        QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
-        wrapper.eq("hospital_id",medicalRecord.getHospitalId());
-        wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
-        ModelHospital mode=modelHospitalFacade.getOne(wrapper, false);
-        if(mode!=null){
-            modeId=mode.getStandModelId();
-        }else{
-            modeId=Long.valueOf("0");
+        try {
+            QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
+            wrapper.eq("hospital_id",medicalRecord.getHospitalId());
+            wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
+            ModelHospital mode=modelHospitalFacade.getOne(wrapper, false);
+            if(mode!=null){
+                modeId=mode.getStandModelId();
+            }else{
+                modeId=Long.valueOf("0");
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-初始化modeId",JSON.toJSONString(medicalRecord),modeId.toString(),"操作成功!");
+            return modeId;
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-初始化modeId",JSON.toJSONString(medicalRecord),"",e.getMessage());
+            return modeId;
         }
-        return modeId;
+
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if (StringUtil.isNotBlank(aDeleteFlagVO.getRecId())) {
-            return RespDTO.onError("请输入文书序号!");
-        } else if (aDeleteFlagVO.getHospitalId() == null) {
-            return RespDTO.onError("请输入医院编码!");
-        } else if (StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())) {
-            return RespDTO.onError("请输入病人住院编码!");
-        }else {
-            UpdateWrapper<MedicalRecord> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
-
-            Boolean flag=update(new MedicalRecord(),updateWrapper);
-
-            UpdateWrapper<MedicalRecordContent> updateWrapperContent=new UpdateWrapper<>();
-            updateWrapperContent.eq("rec_id", aDeleteFlagVO.getRecId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
-
-            Boolean flagContent=aMedicalRecordContentFacade.update(new MedicalRecordContent(),updateWrapperContent);
-            return RespDTO.onSuc(flag);
+        try {
+            //验证数据是否存在
+            if (StringUtil.isEmpty(aDeleteFlagVO.getRecId())) {
+                return RespDTO.onError("请输入文书序号!");
+            } else if (aDeleteFlagVO.getHospitalId() == null) {
+                return RespDTO.onError("请输入医院编码!");
+            } else if (StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())) {
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<MedicalRecord> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedicalRecord(),updateWrapper);
+                if(flag){
+                    UpdateWrapper<MedicalRecordContent> updateWrapperContent=new UpdateWrapper<>();
+                    updateWrapperContent.eq("rec_id", aDeleteFlagVO.getRecId())
+                            .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                            .eq("is_deleted",IsDeleteEnum.N)
+                            .set("is_deleted",IsDeleteEnum.Y)
+                            .set("gmt_modified", DateUtil.now());
+
+                    Boolean flagContent=aMedicalRecordContentFacade.update(new MedicalRecordContent(),updateWrapperContent);
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flagContent)),"操作成功!");
+                }
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

src/main/resources/mapper/BasDeptInfoMapper.xml

@@ -81,21 +81,11 @@
         <foreach collection="list" item="item"  separator=";">
             update bas_dept_info
             <set>
-                <if test="item.parentDeptId != null">
-                    parent_dept_id = #{item.parentDeptId},
-                </if>
-                <if test="item.deptName != null">
-                    dept_name = #{item.deptName},
-                </if>
-                <if test="item.deptType != null">
+                  parent_dept_id = #{item.parentDeptId},
+                  dept_name = #{item.deptName},
                     dept_type = #{item.deptType},
-                </if>
-                <if test="item.spell != null">
                     spell = #{item.spell},
-                </if>
-                <if test="item.station != null">
                     station = #{item.station},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/BasDoctorInfoMapper.xml

@@ -21,18 +21,10 @@
         <foreach collection="list" item="item"  separator=";">
             update bas_doctor_info
             <set>
-                <if test="item.deptId != null">
                     dept_id = #{item.deptId},
-                </if>
-                <if test="item.name != null">
                     name = #{item.name},
-                </if>
-                <if test="item.professor != null">
                     professor = #{item.professor},
-                </if>
-                <if test="item.occup != null">
                     occup = #{item.occup},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2903,81 +2903,31 @@
         <foreach collection="list" item="item"  separator=";">
             update med_behospital_info
             <set>
-                <if test="item.name != null">
                     name = #{item.name},
-                </if>
-                <if test="item.sex != null">
                     sex = #{item.sex},
-                </if>
-                <if test="item.birthday != null">
                     birthday = #{item.birthday},
-                </if>
-                <if test="item.fileCode != null">
                     file_code = #{item.fileCode},
-                </if>
-                <if test="item.qcTypeId != null">
                     qc_type_id = #{item.qcTypeId},
-                </if>
-                <if test="item.wardCode != null">
                     ward_code = #{item.wardCode},
-                </if>
-                <if test="item.wardName != null">
                     ward_name = #{item.wardName},
-                </if>
-                <if test="item.behDeptId != null">
                     beh_dept_id = #{item.behDeptId},
-                </if>
-                <if test="item.behDeptName != null">
                     beh_dept_name = #{item.behDeptName},
-                </if>
-                <if test="item.bedCode != null">
                     bed_code = #{item.bedCode},
-                </if>
-                <if test="item.bedName != null">
                     bed_name = #{item.bedName},
-                </if>
-                <if test="item.insuranceName != null">
                     insurance_name = #{item.insuranceName},
-                </if>
-                <if test="item.jobType != null">
                     job_type = #{item.jobType},
-                </if>
-                <if test="item.behospitalDate != null">
                     behospital_date = #{item.behospitalDate},
-                </if>
-                <if test="item.leaveHospitalDate != null">
                     leave_hospital_date = #{item.leaveHospitalDate},
-                </if>
-                <if test="item.diagnoseIcd != null">
                     diagnose_icd = #{item.diagnoseIcd},
-                </if>
-                <if test="item.diagnose != null">
                     diagnose = #{item.diagnose},
-                </if>
-                <if test="item.behDoctorId != null">
                     beh_doctor_id = #{item.behDoctorId},
-                </if>
-                <if test="item.behDoctorName != null">
                     beh_doctor_name = #{item.behDoctorName},
-                </if>
-                <if test="item.doctorId != null">
                     doctor_id = #{item.doctorId},
-                </if>
-                <if test="item.doctorName != null">
                     doctor_name = #{item.doctorName},
-                </if>
-                <if test="item.directorDoctorId != null">
                     director_doctor_id = #{item.directorDoctorId},
-                </if>
-                <if test="item.directorDoctorName != null">
                     director_doctor_name = #{item.directorDoctorName},
-                </if>
-                <if test="item.placefileDate != null">
                     placefile_date = #{item.placefileDate},
-                </if>
-                <if test="item.isPlacefile != null">
                     is_placefile = #{item.isPlacefile},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -41,72 +41,28 @@
         <foreach collection="list" item="item"  separator=";">
             update med_doctor_advice
             <set>
-                <if test="item.orderDoctorName != null">
                     order_doctor_name = #{item.orderDoctorName},
-                </if>
-                <if test="item.frequency != null">
                     frequency = #{item.frequency},
-                </if>
-                <if test="item.parentTypeId != null">
                     parent_type_id = #{item.parentTypeId},
-                </if>
-                <if test="item.doctorAdviceType != null">
                     doctor_advice_type = #{item.doctorAdviceType},
-                </if>
-                <if test="item.usageNum != null">
                     usage_num = #{item.usageNum},
-                </if>
-                <if test="item.usageUnit != null">
                     usage_unit = #{item.usageUnit},
-                </if>
-                <if test="item.dose != null">
                     dose = #{item.dose},
-                </if>
-                <if test="item.doseUnit != null">
                     dose_unit = #{item.doseUnit},
-                </if>
-                <if test="item.medModeType != null">
                     med_mode_type = #{item.medModeType},
-                </if>
-                <if test="item.daFrequency != null">
                     da_frequency = #{item.daFrequency},
-                </if>
-                <if test="item.daDealType != null">
                     da_deal_type = #{item.daDealType},
-                </if>
-                <if test="item.daStartDate != null">
                     da_start_date = #{item.daStartDate},
-                </if>
-                <if test="item.daItemName != null">
                     da_item_name = #{item.daItemName},
-                </if>
-                <if test="item.daStatus != null">
                     da_status = #{item.daStatus},
-                </if>
-                <if test="item.daStopDate != null">
                     da_stop_date = #{item.daStopDate},
-                </if>
-                <if test="item.daGroupNo != null">
                     da_group_no = #{item.daGroupNo},
-                </if>
-                <if test="item.daPrescriptionType != null">
                     da_prescription_type = #{item.daPrescriptionType},
-                </if>
-                <if test="item.daMedType != null">
                     da_med_type = #{item.daMedType},
-                </if>
-                <if test="item.doctorNotice != null">
                     doctor_notice = #{item.doctorNotice},
-                </if>
-                <if test="item.doctorId != null">
                     doctor_id = #{item.doctorId},
-                </if>
-                <if test="item.doctorName != null">
                     doctor_name = #{item.doctorName},
-                </if>
-                <if test="item.medicineType != null">
                     medicine_type = #{item.medicineType},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/HomeDiagnoseInfoMapper.xml

@@ -25,27 +25,13 @@
         <foreach collection="list" item="item"  separator=";">
             update med_home_diagnose_info
             <set>
-                <if test="item.diagnoseType != null">
                     diagnose_type = #{item.diagnoseType},
-                </if>
-                <if test="item.diagnoseTypeShort != null">
                     diagnose_type_short = #{item.diagnoseTypeShort},
-                </if>
-                <if test="item.diagnoseName != null">
                     diagnose_name = #{item.diagnoseName},
-                </if>
-                <if test="item.behospitalType != null">
                     behospital_type = #{item.behospitalType},
-                </if>
-                <if test="item.leaveHospitalType != null">
                     leave_hospital_type = #{item.leaveHospitalType},
-                </if>
-                <if test="item.pathologyDiagnose != null">
                     pathology_diagnose = #{item.pathologyDiagnose},
-                </if>
-                <if test="item.icdCode != null">
                     icd_code = #{item.icdCode},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/HomeOperationInfoMapper.xml

@@ -29,39 +29,17 @@
         <foreach collection="list" item="item"  separator=";">
             update med_home_operation_info
             <set>
-                <if test="item.operationDate != null">
                     operation_date = #{item.operationDate},
-                </if>
-                <if test="item.operationCode != null">
                     operation_code = #{item.operationCode},
-                </if>
-                <if test="item.operationDoctorId != null">
                     operation_doctor_id = #{item.operationDoctorId},
-                </if>
-                <if test="item.firstAssistantId != null">
                     first_assistant_id = #{item.firstAssistantId},
-                </if>
-                <if test="item.secondAssistantId != null">
                     second_assistant_id = #{item.secondAssistantId},
-                </if>
-                <if test="item.cutLevel != null">
                     cut_level = #{item.cutLevel},
-                </if>
-                <if test="item.healingLevel != null">
                     healing_level = #{item.healingLevel},
-                </if>
-                <if test="item.operationName != null">
                     operation_name = #{item.operationName},
-                </if>
-                <if test="item.operationLevel != null">
                     operation_level = #{item.operationLevel},
-                </if>
-                <if test="item.anaesthesiaName != null">
                     anaesthesia_name = #{item.anaesthesiaName},
-                </if>
-                <if test="item.shamOperationName != null">
                     sham_operation_name = #{item.shamOperationName},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/HomePageMapper.xml

@@ -456,376 +456,129 @@
         <foreach collection="list" item="item"  separator=";">
             update med_home_page
             <set>
-                <if test="item.hospitalCode != null">
                     hospital_code = #{item.hospitalCode},
-                </if>
-                <if test="item.hospitalName != null">
                     hospital_name = #{item.hospitalName},
-                </if>
-                <if test="item.orgCode != null">
                     org_code = #{item.orgCode},
-                </if>
-                <if test="item.payType != null">
                     pay_type = #{item.payType},
-                </if>
-                <if test="item.healthCard != null">
                     health_card = #{item.healthCard},
-                </if>
-                <if test="item.behospitalNum != null">
                     behospital_num = #{item.behospitalNum},
-                </if>
-                <if test="item.fileCode != null">
                     file_code = #{item.fileCode},
-                </if>
-                <if test="item.name != null">
                     name = #{item.name},
-                </if>
-                <if test="item.sex != null">
                     sex = #{item.sex},
-                </if>
-                <if test="item.birthday != null">
                     birthday = #{item.birthday},
-                </if>
-                <if test="item.age != null">
                     age = #{item.age},
-                </if>
-                <if test="item.ageUnit != null">
                     age_unit = #{item.ageUnit},
-                </if>
-                <if test="item.nationality != null">
                     nationality = #{item.nationality},
-                </if>
-                <if test="item.newbornMonth != null">
                     newborn_month = #{item.newbornMonth},
-                </if>
-                <if test="item.newbornDay != null">
                     newborn_day = #{item.newbornDay},
-                </if>
-                <if test="item.newbornWeight != null">
                     newborn_weight = #{item.newbornWeight},
-                </if>
-                <if test="item.newbornBehospitalWeight != null">
                     newborn_behospital_weight = #{item.newbornBehospitalWeight},
-                </if>
-                <if test="item.bornAddress != null">
                     born_address = #{item.bornAddress},
-                </if>
-                <if test="item.bornPlace != null">
                     born_place = #{item.bornPlace},
-                </if>
-                <if test="item.nation != null">
                     nation = #{item.nation},
-                </if>
-                <if test="item.identityCardNo != null">
                     identity_card_no = #{item.identityCardNo},
-                </if>
-                <if test="item.jobType != null">
                     job_type = #{item.jobType},
-                </if>
-                <if test="item.marriage != null">
                     marriage = #{item.marriage},
-                </if>
-                <if test="item.curAddress != null">
                     cur_address = #{item.curAddress},
-                </if>
-                <if test="item.curPhone != null">
                     cur_phone = #{item.curPhone},
-                </if>
-                <if test="item.curPostCode != null">
                     cur_post_code = #{item.curPostCode},
-                </if>
-                <if test="item.residenceAddress != null">
                     residence_address = #{item.residenceAddress},
-                </if>
-                <if test="item.residencePostCode != null">
                     residence_post_code = #{item.residencePostCode},
-                </if>
-                <if test="item.workAddress != null">
                     work_address = #{item.workAddress},
-                </if>
-                <if test="item.workPhone != null">
                     work_phone = #{item.workPhone},
-                </if>
-                <if test="item.workPostCode != null">
                     work_post_code = #{item.workPostCode},
-                </if>
-                <if test="item.contactName != null">
                     contact_name = #{item.contactName},
-                </if>
-                <if test="item.contactRelation != null">
                     contact_relation = #{item.contactRelation},
-                </if>
-                <if test="item.contactAddress != null">
                     contact_address = #{item.contactAddress},
-                </if>
-                <if test="item.contactPhone != null">
                     contact_phone = #{item.contactPhone},
-                </if>
-                <if test="item.behospitalWay != null">
                     behospital_way = #{item.behospitalWay},
-                </if>
-                <if test="item.behospitalDate != null">
                     behospital_date = #{item.behospitalDate},
-                </if>
-                <if test="item.behospitalDept != null">
                     behospital_dept = #{item.behospitalDept},
-                </if>
-                <if test="item.behospitalWard != null">
                     behospital_ward = #{item.behospitalWard},
-                </if>
-                <if test="item.behospitalBedId != null">
                     behospital_bed_id = #{item.behospitalBedId},
-                </if>
-                <if test="item.behospitalBedCode != null">
                     behospital_bed_code = #{item.behospitalBedCode},
-                </if>
-                <if test="item.changeDept != null">
                     change_dept = #{item.changeDept},
-                </if>
-                <if test="item.leaveHospitalDate != null">
                     leave_hospital_date = #{item.leaveHospitalDate},
-                </if>
-                <if test="item.leaveHospitalDept != null">
                     leave_hospital_dept = #{item.leaveHospitalDept},
-                </if>
-                <if test="item.leaveHospitalWard != null">
                     leave_hospital_ward = #{item.leaveHospitalWard},
-                </if>
-                <if test="item.leaveHospitalBedId != null">
                     leave_hospital_bed_id = #{item.leaveHospitalBedId},
-                </if>
-                <if test="item.leaveHospitalBedCode != null">
                     leave_hospital_bed_code = #{item.leaveHospitalBedCode},
-                </if>
-                <if test="item.behospitalDayNum != null">
                     behospital_day_num = #{item.behospitalDayNum},
-                </if>
-                <if test="item.outpatientEmrDiagnose != null">
                     outpatient_emr_diagnose = #{item.outpatientEmrDiagnose},
-                </if>
-                <if test="item.outpatientEmrDiagnoseCode != null">
                     outpatient_emr_diagnose_code = #{item.outpatientEmrDiagnoseCode},
-                </if>
-                <if test="item.poisonFactor != null">
                     poison_factor = #{item.poisonFactor},
-                </if>
-                <if test="item.poisonFactorCode != null">
                     poison_factor_code = #{item.poisonFactorCode},
-                </if>
-                <if test="item.pathologyDiagnose != null">
                     pathology_diagnose = #{item.pathologyDiagnose},
-                </if>
-                <if test="item.pathologyDiagnoseCode != null">
                     pathology_diagnose_code = #{item.pathologyDiagnoseCode},
-                </if>
-                <if test="item.pathologyDiagnoseId != null">
                     pathology_diagnose_id = #{item.pathologyDiagnoseId},
-                </if>
-                <if test="item.isMedAllergy != null">
                     is_med_allergy = #{item.isMedAllergy},
-                </if>
-                <if test="item.medAllergyName != null">
                     med_allergy_name = #{item.medAllergyName},
-                </if>
-                <if test="item.autopsy != null">
                     autopsy = #{item.autopsy},
-                </if>
-                <if test="item.bloodType != null">
                     blood_type = #{item.bloodType},
-                </if>
-                <if test="item.rh != null">
                     rh = #{item.rh},
-                </if>
-                <if test="item.deptDirector != null">
                     dept_director = #{item.deptDirector},
-                </if>
-                <if test="item.directorDoctor != null">
                     director_doctor = #{item.directorDoctor},
-                </if>
-                <if test="item.attendingDoctor != null">
                     attending_doctor = #{item.attendingDoctor},
-                </if>
-                <if test="item.behospitalDoctor != null">
                     behospital_doctor = #{item.behospitalDoctor},
-                </if>
-                <if test="item.responseNurse != null">
                     response_nurse = #{item.responseNurse},
-                </if>
-                <if test="item.studyDoctor != null">
                     study_doctor = #{item.studyDoctor},
-                </if>
-                <if test="item.practiceDoctor != null">
                     practice_doctor = #{item.practiceDoctor},
-                </if>
-                <if test="item.encodeMan != null">
                     encode_man = #{item.encodeMan},
-                </if>
-                <if test="item.homePageQuality != null">
                     home_page_quality = #{item.homePageQuality},
-                </if>
-                <if test="item.qcDoctor != null">
                     qc_doctor = #{item.qcDoctor},
-                </if>
-                <if test="item.qcNurse != null">
                     qc_nurse = #{item.qcNurse},
-                </if>
-                <if test="item.qcDate != null">
                     qc_date = #{item.qcDate},
-                </if>
-                <if test="item.leaveHospitalType != null">
                     leave_hospital_type = #{item.leaveHospitalType},
-                </if>
-                <if test="item.acceptOrgCode != null">
                     accept_org_code = #{item.acceptOrgCode},
-                </if>
-                <if test="item.againBehospitalPlan != null">
                     again_behospital_plan = #{item.againBehospitalPlan},
-                </if>
-                <if test="item.againBehospitalGoal != null">
                     again_behospital_goal = #{item.againBehospitalGoal},
-                </if>
-                <if test="item.tbiBeforeDay != null">
                     tbi_before_day = #{item.tbiBeforeDay},
-                </if>
-                <if test="item.tbiBeforeHour != null">
                     tbi_before_hour = #{item.tbiBeforeHour},
-                </if>
-                <if test="item.tbiBeforeMinute != null">
                     tbi_before_minute = #{item.tbiBeforeMinute},
-                </if>
-                <if test="item.tbiAfterDay != null">
                     tbi_after_day = #{item.tbiAfterDay},
-                </if>
-                <if test="item.tbiAfterHour != null">
                     tbi_after_hour = #{item.tbiAfterHour},
-                </if>
-                <if test="item.tbiAfterMinute != null">
                     tbi_after_minute = #{item.tbiAfterMinute},
-                </if>
-                <if test="item.totalFee != null">
                     total_fee = #{item.totalFee},
-                </if>
-                <if test="item.ownFee != null">
                     own_fee = #{item.ownFee},
-                </if>
-                <if test="item.generalFee != null">
                     general_fee = #{item.generalFee},
-                </if>
-                <if test="item.serviceFee != null">
                     service_fee = #{item.serviceFee},
-                </if>
-                <if test="item.nurseFee != null">
                     nurse_fee = #{item.nurseFee},
-                </if>
-                <if test="item.otherFee != null">
                     other_fee = #{item.otherFee},
-                </if>
-                <if test="item.pathologyFee != null">
                     pathology_fee = #{item.pathologyFee},
-                </if>
-                <if test="item.labFee != null">
                     lab_fee = #{item.labFee},
-                </if>
-                <if test="item.pacsFee != null">
                     pacs_fee = #{item.pacsFee},
-                </if>
-                <if test="item.clinicDiagnoseFee != null">
                     clinic_diagnose_fee = #{item.clinicDiagnoseFee},
-                </if>
-                <if test="item.notOperationFee != null">
                     not_operation_fee = #{item.notOperationFee},
-                </if>
-                <if test="item.clinicPhysicFee != null">
                     clinic_physic_fee = #{item.clinicPhysicFee},
-                </if>
-                <if test="item.operationTreatFee != null">
                     operation_treat_fee = #{item.operationTreatFee},
-                </if>
-                <if test="item.anaesthesiaFee != null">
                     anaesthesia_fee = #{item.anaesthesiaFee},
-                </if>
-                <if test="item.operationFee != null">
                     operation_fee = #{item.operationFee},
-                </if>
-                <if test="item.healthTypeFee != null">
                     health_type_fee = #{item.healthTypeFee},
-                </if>
-                <if test="item.chnTreatFee != null">
                     chn_treat_fee = #{item.chnTreatFee},
-                </if>
-                <if test="item.westernMedFee != null">
                     western_med_fee = #{item.westernMedFee},
-                </if>
-                <if test="item.antibiosisFee != null">
                     antibiosis_fee = #{item.antibiosisFee},
-                </if>
-                <if test="item.chnMedFee != null">
                     chn_med_fee = #{item.chnMedFee},
-                </if>
-                <if test="item.chnHerbFee != null">
                     chn_herb_fee = #{item.chnHerbFee},
-                </if>
-                <if test="item.bloodFee != null">
                     blood_fee = #{item.bloodFee},
-                </if>
-                <if test="item.albumenFee != null">
                     albumen_fee = #{item.albumenFee},
-                </if>
-                <if test="item.globulinFee != null">
                     globulin_fee = #{item.globulinFee},
-                </if>
-                <if test="item.bloodFactorFee != null">
                     blood_factor_fee = #{item.bloodFactorFee},
-                </if>
-                <if test="item.cellFactorFee != null">
                     cell_factor_fee = #{item.cellFactorFee},
-                </if>
-                <if test="item.checkMaterialFee != null">
                     check_material_fee = #{item.checkMaterialFee},
-                </if>
-                <if test="item.treatMaterialFee != null">
                     treat_material_fee = #{item.treatMaterialFee},
-                </if>
-                <if test="item.operationMaterialFee != null">
                     operation_material_fee = #{item.operationMaterialFee},
-                </if>
-                <if test="item.otherTypeFee != null">
                     other_type_fee = #{item.otherTypeFee},
-                </if>
-                <if test="item.singleDiagManage != null">
                     single_diag_manage = #{item.singleDiagManage},
-                </if>
-                <if test="item.clinicPathwayManage != null">
                     clinic_pathway_manage = #{item.clinicPathwayManage},
-                </if>
-                <if test="item.isOutpatientBehospital != null">
                     is_outpatient_behospital = #{item.isOutpatientBehospital},
-                </if>
-                <if test="item.isLeaveBehospital != null">
                     is_leave_behospital = #{item.isLeaveBehospital},
-                </if>
-                <if test="item.isOperationBeforeAfter != null">
                     is_operation_before_after = #{item.isOperationBeforeAfter},
-                </if>
-                <if test="item.isClinicPathology != null">
                     is_clinic_pathology = #{item.isClinicPathology},
-                </if>
-                <if test="item.isRadiatePathology != null">
                     is_radiate_pathology = #{item.isRadiatePathology},
-                </if>
-                <if test="item.rescueNum != null">
                     rescue_num = #{item.rescueNum},
-                </if>
-                <if test="item.rescueSuccessNum != null">
                     rescue_success_num = #{item.rescueSuccessNum},
-                </if>
-                <if test="item.isAutoLeavehospital != null">
                     is_auto_leavehospital = #{item.isAutoLeavehospital},
-                </if>
-                <if test="item.returnToType != null">
                     return_to_type = #{item.returnToType},
-                </if>
-
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/MedAbnormalInfoMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedAbnormalInfo">
         <id column="abnormal_id" property="abnormalId" />
+        <result column="module_name" property="moduleName" />
         <result column="param_in" property="paramIn" />
         <result column="param_out" property="paramOut" />
         <result column="ramark" property="ramark" />

src/main/resources/mapper/MedCrisisInfoMapper.xml

@@ -32,45 +32,19 @@
         <foreach collection="list" item="item"  separator=";">
             update med_crisis_info
             <set>
-                <if test="item.crisisId != null">
                     crisis_id = #{item.crisisId},
-                </if>
-                <if test="item.crisisName != null">
                     crisis_name = #{item.crisisName},
-                </if>
-                <if test="item.deptId != null">
                     dept_id = #{item.deptId},
-                </if>
-                <if test="item.deptName != null">
                     dept_name = #{item.deptName},
-                </if>
-                <if test="item.doctorId != null">
                     doctor_id = #{item.doctorId},
-                </if>
-                <if test="item.doctorName != null">
                     doctor_name = #{item.doctorName},
-                </if>
-                <if test="item.crisisValue != null">
                     crisis_value = #{item.crisisValue},
-                </if>
-                <if test="item.crisisDesc != null">
                     crisis_desc = #{item.crisisDesc},
-                </if>
-                <if test="item.crisisStatus != null">
                     crisis_status = #{item.crisisStatus},
-                </if>
-                <if test="item.crisisTopValue != null">
                     crisis_top_value = #{item.crisisTopValue},
-                </if>
-                <if test="item.crisisLowerValue != null">
                     crisis_lower_value = #{item.crisisLowerValue},
-                </if>
-                <if test="item.sendDate != null">
                     send_date = #{item.sendDate},
-                </if>
-                <if test="item.repDate != null">
                     rep_date = #{item.repDate},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/MedicalRecordContentMapper.xml

@@ -21,12 +21,8 @@
         <foreach collection="list" item="item"  separator=";">
             update med_medical_record_content
             <set>
-                <if test="item.htmlText != null">
                     html_text = #{item.htmlText},
-                </if>
-                <if test="item.xmlText != null">
                     xml_text = #{item.xmlText},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/MedicalRecordMapper.xml

@@ -37,18 +37,10 @@
         <foreach collection="list" item="item"  separator=";">
             update med_medical_record
             <set>
-                <if test="item.orgCode != null">
                     org_code = #{item.orgCode},
-                </if>
-                <if test="item.recTypeId != null">
                     rec_type_id = #{item.recTypeId},
-                </if>
-                <if test="item.recDate != null">
                     rec_date = #{item.recDate},
-                </if>
-                <if test="item.recTitle != null">
                     rec_title = #{item.recTitle},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>