med_abnormal_info表信息添加rec_id字段

doc/023.20200923v1.5.0/qc_initv1.5.0.sql

@@ -2,7 +2,8 @@ use `qc`;
 DROP TABLE IF EXISTS `med_abnormal_info`;
 CREATE TABLE `med_abnormal_info`  (
   `abnormal_id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `module_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '模块名称',
+  `module_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `rec_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '模块名称',
   `param_in` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '入参',
   `param_out` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '出参',
   `ramark` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '异常描述',

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

@@ -8,7 +8,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author gaodm
@@ -29,6 +29,11 @@ public class MedAbnormalInfo implements Serializable {
      */
     private String moduleName;
 
+    /**
+     * 文书id
+     */
+    private String recId;
+
     /**
      * 入参
      */
@@ -76,6 +81,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setAbnormalId(Long abnormalId) {
         this.abnormalId = abnormalId;
     }
+
     public String getModuleName() {
         return moduleName;
     }
@@ -83,6 +89,15 @@ public class MedAbnormalInfo implements Serializable {
     public void setModuleName(String moduleName) {
         this.moduleName = moduleName;
     }
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+
     public String getParamIn() {
         return paramIn;
     }
@@ -90,6 +105,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setParamIn(String paramIn) {
         this.paramIn = paramIn;
     }
+
     public String getParamOut() {
         return paramOut;
     }
@@ -97,6 +113,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setParamOut(String paramOut) {
         this.paramOut = paramOut;
     }
+
     public String getRamark() {
         return ramark;
     }
@@ -104,6 +121,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setRamark(String ramark) {
         this.ramark = ramark;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -111,6 +129,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -118,6 +137,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -125,6 +145,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -132,6 +153,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -143,16 +165,17 @@ public class MedAbnormalInfo implements Serializable {
     @Override
     public String toString() {
         return "MedAbnormalInfo{" +
-            "abnormalId=" + abnormalId +
+                "abnormalId=" + abnormalId +
                 ", moduleName=" + moduleName +
-            ", paramIn=" + paramIn +
-            ", paramOut=" + paramOut +
-            ", ramark=" + ramark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
+                ", recId=" + recId +
+                ", paramIn=" + paramIn +
+                ", paramOut=" + paramOut +
+                ", ramark=" + ramark +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
     }
 }

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

@@ -99,7 +99,7 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息", JSON.toJSONString(basDeptInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息","", JSON.toJSONString(basDeptInfoList),"",e.getMessage());
         }
     }
 }

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

@@ -94,7 +94,7 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息", JSON.toJSONString(basDoctorInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息","", JSON.toJSONString(basDoctorInfoList),"",e.getMessage());
         }
     }
 }

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

@@ -138,7 +138,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记", JSON.toJSONString(behospitalInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记","", JSON.toJSONString(behospitalInfoList),"",e.getMessage());
         }
     }
 
@@ -194,7 +194,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 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());
         }
     }
@@ -219,7 +219,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-归档",JSON.toJSONString(aPlaceFileVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-归档","",JSON.toJSONString(aPlaceFileVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

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

@@ -114,7 +114,7 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("医嘱信息", JSON.toJSONString(doctorAdviceList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医嘱信息","", JSON.toJSONString(doctorAdviceList),"",e.getMessage());
         }
     }
 
@@ -141,7 +141,7 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 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

@@ -93,7 +93,7 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-医嘱", JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-医嘱","", JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
         }
     }
 
@@ -120,7 +120,7 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                 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

@@ -95,7 +95,7 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术", JSON.toJSONString(homeOperationList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术","",JSON.toJSONString(homeOperationList),"",e.getMessage());
         }
     }
 
@@ -122,7 +122,7 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                 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

@@ -140,7 +140,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             execute(homePageList);
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","", JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
         }
     }
 
@@ -262,7 +262,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", JSON.toJSONString(homePageList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","", JSON.toJSONString(homePageList),"",e.getMessage());
         }
     }
 
@@ -288,7 +288,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 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

@@ -10,13 +10,15 @@ import java.util.Date;
 public class AMedAbnormalInfoFacade extends MedAbnormalInfoServiceImpl {
     /**
      * 接口日志记录
+     *
      * @param paramIn
      * @param paramOut
      * @param remark
      */
-    public void saveAbnormalInfo(String moduleName,String paramIn,String paramOut,String remark){
-        MedAbnormalInfo medAbnormalInfo=new MedAbnormalInfo();
+    public void saveAbnormalInfo(String moduleName, String recId, String paramIn, String paramOut, String remark) {
+        MedAbnormalInfo medAbnormalInfo = new MedAbnormalInfo();
         medAbnormalInfo.setModuleName(moduleName);
+        medAbnormalInfo.setRecId(recId);
         medAbnormalInfo.setParamIn(paramIn);
         medAbnormalInfo.setParamOut(paramOut);
         medAbnormalInfo.setRamark(remark);

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

@@ -25,27 +25,27 @@ public class AMedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
+    public void getColumnZhAndCh() {
+        List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
+        list.forEach(s -> {
             s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
         });
 
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"medAdmissionNote");
+        Map<String, String> columnMap = EntityUtil.makeMapWithKeyValue(list, "ch", "en");
+        Boolean flag = columnFacade.createColumn(columnMap, "medAdmissionNote");
 
         //Map<String, String> map=columnFacade.getColumn("medAdmissionNote");
-        if(!flag){
+        if (!flag) {
             return;
         }
     }
 
     //入院记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap, Map<String, Object> entityMap, Long hospitalId) {
+        MedAdmissionNote medAdmissionNote = new MedAdmissionNote();
         try {
-            AMedAdmissionNoteVO medAdmissionNoteVO=(AMedAdmissionNoteVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
-            MedAdmissionNote medAdmissionNote=new MedAdmissionNote();
-            BeanUtils.copyProperties(medAdmissionNoteVO,medAdmissionNote);
+            AMedAdmissionNoteVO medAdmissionNoteVO = (AMedAdmissionNoteVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
+            BeanUtils.copyProperties(medAdmissionNoteVO, medAdmissionNote);
             medAdmissionNote.setHospitalId(hospitalId);//医院编码
 
             medAdmissionNote.setAuditDate(DateUtil.parseDateTime(medAdmissionNoteVO.getAuditDate()));//审核时间
@@ -56,30 +56,30 @@ public class AMedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
 
             medAdmissionNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
-            if(isExist(medAdmissionNote)){
+            if (isExist(medAdmissionNote)) {
                 medAdmissionNote.setGmtCreate(new Date());//记录创建时间
                 this.save(medAdmissionNote);
-            }else{
+            } else {
                 medAdmissionNote.setGmtModified(new Date());//记录修改时间
-                this.update(medAdmissionNote,new QueryWrapper<MedAdmissionNote>()
+                this.update(medAdmissionNote, new QueryWrapper<MedAdmissionNote>()
                         .eq("rec_id", medAdmissionNote.getRecId())
                         .eq("hospital_id", medAdmissionNote.getHospitalId())
                         .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
             }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录", JSON.toJSONString(entityMap),"",e.getMessage());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录", medAdmissionNote.getRecId(), JSON.toJSONString(entityMap), "", e.getMessage());
         }
     }
 
-    public Boolean isExist(MedAdmissionNote medAdmissionNote){
-        Boolean flag=true;
+    public Boolean isExist(MedAdmissionNote medAdmissionNote) {
+        Boolean flag = true;
         int count = this.baseMapper.selectCount(new QueryWrapper<MedAdmissionNote>()
                 .eq("rec_id", medAdmissionNote.getRecId())
                 .eq("hospital_id", medAdmissionNote.getHospitalId())
                 .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
+        if (count > 0) {
+            flag = false;
         }
         return flag;
     }

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

@@ -39,9 +39,9 @@ public class AMedBloodResultFacade extends MedBloodResultServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedBloodResult medBloodResult=new MedBloodResult();
         try {
             AMedBloodResultVO medBloodResultVO=(AMedBloodResultVO) MapUtil.mapToObject(entityMap, AMedBloodResultVO.class);
-            MedBloodResult medBloodResult=new MedBloodResult();
             BeanUtils.copyProperties(medBloodResultVO,medBloodResult);
             medBloodResult.setHospitalId(hospitalId);//医院编码
             medBloodResult.setAuditDate(DateUtil.parseDateTime(medBloodResultVO.getAuditDate()));//审核时间
@@ -63,7 +63,7 @@ public class AMedBloodResultFacade extends MedBloodResultServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("输血效果评价", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("输血效果评价",medBloodResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedBloodTransfusion medBloodTransfusion=new MedBloodTransfusion();
         try {
             AMedBloodTransfusionVO medBloodTransfusionVO=(AMedBloodTransfusionVO) MapUtil.mapToObject(entityMap, AMedBloodTransfusionVO.class);
-            MedBloodTransfusion medBloodTransfusion=new MedBloodTransfusion();
             BeanUtils.copyProperties(medBloodTransfusionVO,medBloodTransfusion);
             medBloodTransfusion.setHospitalId(hospitalId);//医院编码
             medBloodTransfusion.setStartTime(DateUtil.parseDateTime(medBloodTransfusionVO.getStartTime()));
@@ -69,7 +69,7 @@ public class AMedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("输血记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("输血记录", medBloodTransfusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedConsultationApplyFacade extends MedConsultationApplyServiceImpl
 
     //会诊申请单
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedConsultationApply medConsultationApply=new MedConsultationApply();
         try {
             AMedConsultationApplyVO medConsultationApplyVO=(AMedConsultationApplyVO) MapUtil.mapToObject(entityMap, AMedConsultationApplyVO.class);
-            MedConsultationApply medConsultationApply=new MedConsultationApply();
             BeanUtils.copyProperties(medConsultationApplyVO,medConsultationApply);
             medConsultationApply.setHospitalId(hospitalId);//医院编码
 
@@ -69,7 +69,7 @@ public class AMedConsultationApplyFacade extends MedConsultationApplyServiceImpl
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊申请单", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊申请单",medConsultationApply.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -43,9 +43,9 @@ public class AMedConsultationNoteFacade extends MedConsultationNoteServiceImpl {
 
     //会诊单（申请和结果）
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedConsultationNote medConsultationNote=new MedConsultationNote();
         try {
             AMedConsultationNoteVO medConsultationNoteVO=(AMedConsultationNoteVO) MapUtil.mapToObject(entityMap, AMedConsultationNoteVO.class);
-            MedConsultationNote medConsultationNote=new MedConsultationNote();
             BeanUtils.copyProperties(medConsultationNoteVO,medConsultationNote);
             medConsultationNote.setHospitalId(hospitalId);//医院编码
 
@@ -71,7 +71,7 @@ public class AMedConsultationNoteFacade extends MedConsultationNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊单（申请和结果）", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊单（申请和结果）",medConsultationNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -43,9 +43,9 @@ public class AMedConsultationResultFacade extends MedConsultationResultServiceIm
 
     //会诊结果单
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedConsultationResult medConsultationResult=new MedConsultationResult();
         try {
             AMedConsultationResultVO medConsultationResultVO=(AMedConsultationResultVO) MapUtil.mapToObject(entityMap, AMedConsultationResultVO.class);
-            MedConsultationResult medConsultationResult=new MedConsultationResult();
             BeanUtils.copyProperties(medConsultationResultVO,medConsultationResult);
             medConsultationResult.setHospitalId(hospitalId);//医院编码
 
@@ -71,7 +71,7 @@ public class AMedConsultationResultFacade extends MedConsultationResultServiceIm
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊结果单", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊结果单",medConsultationResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -18,7 +18,7 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
+public class AMedCrisisFacade extends MedCrisisInfoServiceImpl {
 
     @Autowired
     @Qualifier("medCrisisInfoServiceImpl")
@@ -27,43 +27,43 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     public RespDTO<List<AMedCrisisDTO>> executeMedCrisis(List<AMedCrisisVO> list) {
-        if(list!=null && list.size()>0){
+        if (list != null && list.size() > 0) {
             //循环验证数据有效性
-            for (AMedCrisisVO aMedCrisisVO:list) {
-                if("".equals(aMedCrisisVO.getRecId())){
+            for (AMedCrisisVO aMedCrisisVO : list) {
+                if ("".equals(aMedCrisisVO.getRecId())) {
                     return RespDTO.onError("请输入文书编码!");
-                }else if("".equals(aMedCrisisVO.getBehospitalCode())) {
+                } else if ("".equals(aMedCrisisVO.getBehospitalCode())) {
                     return RespDTO.onError("请输入病人住院编码!");
-                }else if(aMedCrisisVO.getHospitalId()==null){
+                } else if (aMedCrisisVO.getHospitalId() == null) {
                     return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(aMedCrisisVO.getRecType())){
+                } else if ("".equals(aMedCrisisVO.getRecType())) {
                     return RespDTO.onError("请输入危急值类型!");
                 }
             }
 
-            List<MedCrisisInfo> medCrisisList=Lists.newArrayList();
-            list.stream().forEach(s->{
-                MedCrisisInfo medCrisisInfo=new MedCrisisInfo();
-                BeanUtil.copyProperties(s,medCrisisInfo);
+            List<MedCrisisInfo> medCrisisList = Lists.newArrayList();
+            list.stream().forEach(s -> {
+                MedCrisisInfo medCrisisInfo = new MedCrisisInfo();
+                BeanUtil.copyProperties(s, medCrisisInfo);
                 medCrisisInfo.setRepDate(DateUtil.parseDateTime(s.getRepDate()));
                 medCrisisInfo.setSendDate(DateUtil.parseDateTime(s.getSendDate()));
                 medCrisisList.add(medCrisisInfo);
             });
             execute(medCrisisList);
 
-            List<AMedCrisisDTO> medCrisisDtoList=BeanUtil.listCopyTo(list,AMedCrisisDTO.class);
+            List<AMedCrisisDTO> medCrisisDtoList = BeanUtil.listCopyTo(list, AMedCrisisDTO.class);
             return RespDTO.onSuc(medCrisisDtoList);
-        }else{
+        } else {
             return RespDTO.onError("未接收到数据!");
         }
     }
 
-    public void execute(List<MedCrisisInfo> medCrisisList){
-        try{
-            List<MedCrisisInfo> addE = Lists.newLinkedList();
-            List<MedCrisisInfo> updateE = Lists.newLinkedList();
-            if (medCrisisList != null && medCrisisList.size() > 0) {
-                medCrisisList.stream().forEach(s -> {
+    public void execute(List<MedCrisisInfo> medCrisisList) {
+        List<MedCrisisInfo> addE = Lists.newLinkedList();
+        List<MedCrisisInfo> updateE = Lists.newLinkedList();
+        if (medCrisisList != null && medCrisisList.size() > 0) {
+            medCrisisList.forEach(s -> {
+                try {
                     MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()
                             .eq("rec_id", s.getRecId())
                             .eq("hospital_id", s.getHospitalId())
@@ -76,17 +76,17 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
                         s.setGmtCreate(new Date());
                         addE.add(s);
                     }
-                });
-            }
-            if(addE.size()>0){
-                medCrisisInfoService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                medCrisisInfoService.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析", JSON.toJSONString(medCrisisList),"",e.getMessage());
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析", s.getRecId(), JSON.toJSONString(medCrisisList), "", e.getMessage());
+                }
+            });
+        }
+        if (addE.size() > 0) {
+            medCrisisInfoService.saveBatch(addE);
+        }
+        if (updateE.size() > 0) {
+            medCrisisInfoService.updateBatchByKey(updateE);
         }
     }
 }

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

@@ -39,9 +39,9 @@ public class AMedCrisisNoteFacade extends MedCrisisNoteServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedCrisisNote medCrisisNote=new MedCrisisNote();
         try {
             AMedCrisisNoteVO medCrisisNoteVO=(AMedCrisisNoteVO) MapUtil.mapToObject(entityMap, AMedCrisisNoteVO.class);
-            MedCrisisNote medCrisisNote=new MedCrisisNote();
             BeanUtils.copyProperties(medCrisisNoteVO,medCrisisNote);
             medCrisisNote.setHospitalId(hospitalId);//医院编码
 
@@ -66,7 +66,7 @@ public class AMedCrisisNoteFacade extends MedCrisisNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值记录",medCrisisNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedDeathDiscussionFacade extends MedDeathDiscussionServiceImpl {
 
     //死亡病例讨论记录
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedDeathDiscussion medDeathDiscussion=new MedDeathDiscussion();
         try {
             AMedDeathDiscussionVO medDeathDiscussionVO=(AMedDeathDiscussionVO) MapUtil.mapToObject(entityMap, AMedDeathDiscussionVO.class);
-            MedDeathDiscussion medDeathDiscussion=new MedDeathDiscussion();
             BeanUtils.copyProperties(medDeathDiscussionVO,medDeathDiscussion);
             medDeathDiscussion.setHospitalId(hospitalId);//医院编码
 
@@ -69,7 +69,7 @@ public class AMedDeathDiscussionFacade extends MedDeathDiscussionServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡病例讨论记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡病例讨论记录",medDeathDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedDeathNoteFacade extends MedDeathNoteServiceImpl {
 
     //死亡记录
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedDeathNote medDeathNote=new MedDeathNote();
         try {
             AMedDeathNoteVO medDeathNoteVO=(AMedDeathNoteVO) MapUtil.mapToObject(entityMap, AMedDeathNoteVO.class);
-            MedDeathNote medDeathNote=new MedDeathNote();
             BeanUtils.copyProperties(medDeathNoteVO,medDeathNote);
             medDeathNote.setHospitalId(hospitalId);//医院编码
 
@@ -69,7 +69,7 @@ public class AMedDeathNoteFacade extends MedDeathNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡记录", medDeathNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -41,9 +41,9 @@ public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedDifficultCase medDifficult=new MedDifficultCase();
         try {
             AMedDifficultCaseVO medDifficultVO=(AMedDifficultCaseVO) MapUtil.mapToObject(entityMap, AMedDifficultCaseVO.class);
-            MedDifficultCase medDifficult=new MedDifficultCase();
             BeanUtils.copyProperties(medDifficultVO,medDifficult);
             medDifficult.setHospitalId(hospitalId);//医院编码
             medDifficult.setRecDate(DateUtil.parseDateTime(medDifficultVO.getRecDate()));
@@ -66,7 +66,7 @@ public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("疑难病例讨论记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("疑难病例讨论记录",medDifficult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedFirstRecord medFirstRecord=new MedFirstRecord();
         try {
             AMedFirstRecordVO medFirstRecordVO=(AMedFirstRecordVO) MapUtil.mapToObject(entityMap, AMedFirstRecordVO.class);
-            MedFirstRecord medFirstRecord=new MedFirstRecord();
             BeanUtils.copyProperties(medFirstRecordVO,medFirstRecord);
             medFirstRecord.setHospitalId(hospitalId);//医院编码
 
@@ -67,7 +67,7 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("首次病程录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("首次病程录", medFirstRecord.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedIllCritically medIllCritically=new MedIllCritically();
         try {
             AMedIllCriticallyVO medIllCriticallyVO=(AMedIllCriticallyVO) MapUtil.mapToObject(entityMap, AMedIllCriticallyVO.class);
-            MedIllCritically medIllCritically=new MedIllCritically();
             BeanUtils.copyProperties(medIllCriticallyVO,medIllCritically);
             medIllCritically.setHospitalId(hospitalId);//医院编码
             medIllCritically.setPatientSignDate(DateUtil.parseDateTime(medIllCriticallyVO.getPatientSignDate()));
@@ -66,7 +66,7 @@ public class AMedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病危通知单", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病危通知单",medIllCritically.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedIllSeriouslFacade extends MedIllSeriouslServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedIllSeriousl medIllSeriousl=new MedIllSeriousl();
         try {
             AMedIllSeriouslVO medIllSeriouslVO=(AMedIllSeriouslVO) MapUtil.mapToObject(entityMap, AMedIllSeriouslVO.class);
-            MedIllSeriousl medIllSeriousl=new MedIllSeriousl();
             BeanUtils.copyProperties(medIllSeriouslVO,medIllSeriousl);
             medIllSeriousl.setHospitalId(hospitalId);//医院编码
             medIllSeriousl.setPatientSignDate(DateUtil.parseDateTime(medIllSeriouslVO.getPatientSignDate()));
@@ -66,7 +66,7 @@ public class AMedIllSeriouslFacade extends MedIllSeriouslServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", medIllSeriousl.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedLeaveHospitalFacade extends MedLeaveHospitalServiceImpl {
 
     //危急值记录
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedLeaveHospital medLeaveHospital=new MedLeaveHospital();
         try {
             AMedLeaveHospitalVO medLeaveHospitalVO=(AMedLeaveHospitalVO) MapUtil.mapToObject(entityMap, AMedLeaveHospitalVO.class);
-            MedLeaveHospital medLeaveHospital=new MedLeaveHospital();
             BeanUtils.copyProperties(medLeaveHospitalVO,medLeaveHospital);
             medLeaveHospital.setHospitalId(hospitalId);//医院编码
 
@@ -69,7 +69,7 @@ public class AMedLeaveHospitalFacade extends MedLeaveHospitalServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("出院小结", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("出院小结",medLeaveHospital.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -62,11 +62,11 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
 
                 return RespDTO.onSuc(list);
             }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,7 +97,7 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("检验",JSON.toJSONString(medLisResultList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("检验",JSON.toJSONString(medLisResultList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验","",JSON.toJSONString(medLisResultList),"",e.getMessage());
         }
     }
 
@@ -121,7 +121,7 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
                 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/AMedOperativeFirstRecord.java

@@ -43,9 +43,9 @@ public class AMedOperativeFirstRecord extends MedOperativeFirstRecordServiceImpl
 
     //术后首程
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedOperativeFirstRecord medOperativeFirstRecord=new MedOperativeFirstRecord();
         try {
             AMedOperativeFirstRecordVO medOperativeFirstRecordVO=(AMedOperativeFirstRecordVO) MapUtil.mapToObject(entityMap, AMedOperativeFirstRecordVO.class);
-            MedOperativeFirstRecord medOperativeFirstRecord=new MedOperativeFirstRecord();
             BeanUtils.copyProperties(medOperativeFirstRecordVO,medOperativeFirstRecord);
             medOperativeFirstRecord.setHospitalId(hospitalId);//医院编码
 
@@ -71,7 +71,7 @@ public class AMedOperativeFirstRecord extends MedOperativeFirstRecordServiceImpl
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("术后首程", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("术后首程",medOperativeFirstRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedOperativeNoteFacade extends MedOperativeNoteServiceImpl {
 
     //手术记录
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedOperativeNote medOperativeNote=new MedOperativeNote();
         try {
             AMedOperativeNoteVO medOperativeNoteVO=(AMedOperativeNoteVO) MapUtil.mapToObject(entityMap, AMedOperativeNoteVO.class);
-            MedOperativeNote medOperativeNote=new MedOperativeNote();
             BeanUtils.copyProperties(medOperativeNoteVO,medOperativeNote);
             medOperativeNote.setHospitalId(hospitalId);//医院编码
 
@@ -70,7 +70,7 @@ public class AMedOperativeNoteFacade extends MedOperativeNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("手术记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("手术记录", medOperativeNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -62,11 +62,11 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
 
                 return RespDTO.onSuc(list);
             }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,7 +97,7 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查","",JSON.toJSONString(medPacsResultList),"",e.getMessage());
         }
     }
 
@@ -121,7 +121,7 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
                 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/AMedPeriodConclusionFacade.java

@@ -43,9 +43,9 @@ public class AMedPeriodConclusionFacade extends MedPeriodConclusionServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedPeriodConclusion medPeriodConclusion=new MedPeriodConclusion();
         try {
             AMedPeriodConclusionVO medPeriodConclusionVO=(AMedPeriodConclusionVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
-            MedPeriodConclusion medPeriodConclusion=new MedPeriodConclusion();
             BeanUtils.copyProperties(medPeriodConclusionVO,medPeriodConclusion);
             medPeriodConclusion.setHospitalId(hospitalId);//医院编码
 
@@ -68,7 +68,7 @@ public class AMedPeriodConclusionFacade extends MedPeriodConclusionServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("阶段小结", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("阶段小结",medPeriodConclusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedPreoperativeDiscussionFacade extends MedPreoperativeDiscussionS
 
     //入院记录
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedPreoperativeDiscussion medPreoperativeDiscussion=new MedPreoperativeDiscussion();
         try {
             AMedPreoperativeDiscussionVO medPreoperativeDiscussionVO=(AMedPreoperativeDiscussionVO) MapUtil.mapToObject(entityMap, AMedPreoperativeDiscussionVO.class);
-            MedPreoperativeDiscussion medPreoperativeDiscussion=new MedPreoperativeDiscussion();
             BeanUtils.copyProperties(medPreoperativeDiscussionVO,medPreoperativeDiscussion);
             medPreoperativeDiscussion.setHospitalId(hospitalId);//医院编码
 
@@ -68,7 +68,7 @@ public class AMedPreoperativeDiscussionFacade extends MedPreoperativeDiscussionS
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("术前讨论小结", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("术前讨论小结",medPreoperativeDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -93,7 +93,7 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书类别", JSON.toJSONString(medRecordTypeList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书类别","", JSON.toJSONString(medRecordTypeList),"",e.getMessage());
         }
 
     }

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

@@ -41,9 +41,9 @@ public class AMedRescueNoteFacade extends MedRescueNoteServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedRescueNote medRescueNote=new MedRescueNote();
         try {
             AMedRescueNoteVO medRescueNoteVO=(AMedRescueNoteVO) MapUtil.mapToObject(entityMap, AMedRescueNoteVO.class);
-            MedRescueNote medRescueNote=new MedRescueNote();
             BeanUtils.copyProperties(medRescueNoteVO,medRescueNote);
             medRescueNote.setHospitalId(hospitalId);//医院编码
 
@@ -68,7 +68,7 @@ public class AMedRescueNoteFacade extends MedRescueNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("抢救记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("抢救记录", medRescueNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedTransferInNoteFacade extends MedTransferInNoteServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedTransferInNote medTransferInNote=new MedTransferInNote();
         try {
             AMedTransferInNoteVO medTransferInNoteVO=(AMedTransferInNoteVO) MapUtil.mapToObject(entityMap, AMedTransferInNoteVO.class);
-            MedTransferInNote medTransferInNote=new MedTransferInNote();
             BeanUtils.copyProperties(medTransferInNoteVO,medTransferInNote);
             medTransferInNote.setHospitalId(hospitalId);//医院编码
             medTransferInNote.setTransferInDate(DateUtil.parseDateTime(medTransferInNoteVO.getTransferInDate()));
@@ -67,7 +67,7 @@ public class AMedTransferInNoteFacade extends MedTransferInNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("转入记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("转入记录",medTransferInNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedTransferOutNoteFacade extends MedTransferOutNoteServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedTransferOutNote medTransferOutNote=new MedTransferOutNote();
         try {
             AMedTransferOutNoteVO medTransferOutNoteVO=(AMedTransferOutNoteVO) MapUtil.mapToObject(entityMap, AMedTransferOutNoteVO.class);
-            MedTransferOutNote medTransferOutNote=new MedTransferOutNote();
             BeanUtils.copyProperties(medTransferOutNoteVO,medTransferOutNote);
             medTransferOutNote.setHospitalId(hospitalId);//医院编码
             medTransferOutNote.setTransferInDate(DateUtil.parseDateTime(medTransferOutNoteVO.getTransferInDate()));
@@ -66,7 +66,7 @@ public class AMedTransferOutNoteFacade extends MedTransferOutNoteServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("转出记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("转出记录",medTransferOutNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -42,9 +42,9 @@ public class AMedWardRecordFacade extends MedWardRecordServiceImpl {
 
     //查房记录
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedWardRecord medWardRecord=new MedWardRecord();
         try {
             AMedWardRecordVO medWardRecordVO=(AMedWardRecordVO) MapUtil.mapToObject(entityMap, AMedWardRecordVO.class);
-            MedWardRecord medWardRecord=new MedWardRecord();
             BeanUtils.copyProperties(medWardRecordVO,medWardRecord);
             medWardRecord.setHospitalId(hospitalId);//医院编码
 
@@ -68,7 +68,7 @@ public class AMedWardRecordFacade extends MedWardRecordServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("查房记录", JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("查房记录", medWardRecord.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }

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

@@ -64,7 +64,8 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
             List<MedicalRecordContent> addE = Lists.newLinkedList();
             List<MedicalRecordContent> updateE = Lists.newLinkedList();
             if (mrContentList != null && mrContentList.size() > 0) {
-                mrContentList.stream().forEach(s -> {
+                mrContentList.forEach(s -> {
+                    try {
                     QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("rec_id", s.getRecId());
                     queryWrapper.eq("hospital_id", s.getHospitalId());
@@ -76,6 +77,10 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
                         s.setGmtCreate(new Date());
                         addE.add(s);
                     }
+                    }catch (Exception e){
+                        log.error(e.getMessage(),e);
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",s.getRecId(), JSON.toJSONString(mrContentList),"",e.getMessage());
+                    }
                 });
             }
             if(addE.size()>0){
@@ -86,7 +91,6 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容", JSON.toJSONString(mrContentList),"",e.getMessage());
         }
     }
 
@@ -110,7 +114,7 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",aDeleteFlagVO.getRecId(),JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

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

@@ -209,7 +209,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             columnFacade.analyseRec(queryVo);
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("参数拼接", JSON.toJSONString(aMrContentVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("参数拼接", "",JSON.toJSONString(aMrContentVO),"",e.getMessage());
         }
     }
 
@@ -375,7 +375,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息", JSON.toJSONString(medicalRecordList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息","", JSON.toJSONString(medicalRecordList),"",e.getMessage());
         }
 
     }
@@ -480,7 +480,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 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/ColumnFacade.java

@@ -48,7 +48,7 @@ public class ColumnFacade extends ColumnServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析", JSON.toJSONString(queryVo),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析","", JSON.toJSONString(queryVo),"",e.getMessage());
         }
 
     }
@@ -109,7 +109,7 @@ public class ColumnFacade extends ColumnServiceImpl {
             log.info(modelName+"---- 解析完成！");
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析异常", JSON.toJSONString(columnMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析异常", "",JSON.toJSONString(columnMap),"",e.getMessage());
         }
     }