冲突解决

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

@@ -0,0 +1,39 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.QcModelHospital;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.QcModelHospitalServiceImpl;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2020/4/12 11:39
+ */
+@Component
+public class QcModelHospitalFacade extends QcModelHospitalServiceImpl {
+
+    /**
+     * 获取医院对应的模块信息
+     */
+    @Cacheable(value = "cache", key = "'qcHosModel'")
+    public Map<String, QcModelHospital> getHospitalModel() {
+        Map<String, QcModelHospital> hospitalModelMap = new LinkedHashMap<>();
+        List<QcModelHospital> basHospitalInfoList = this.list(new QueryWrapper<QcModelHospital>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .isNotNull("stand_model_id")
+                .isNotNull("stand_model_name")
+        );
+        hospitalModelMap = basHospitalInfoList.stream()
+                .collect(Collectors.toMap(r -> r.getHospitalId() + "##" + r.getHospitalModelName(), r -> r));
+        return hospitalModelMap;
+    }
+
+}

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

@@ -116,11 +116,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());
         }
     }
@@ -163,7 +163,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(behospitalInfoList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(behospitalInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记","",JSON.toJSONString(behospitalInfoList),"",e.getMessage());
         }
     }
 
@@ -274,7 +274,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 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());
         }
     }
@@ -300,7 +300,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

@@ -96,11 +96,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());
         }
     }
@@ -132,7 +132,7 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(doctorAdviceList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(doctorAdviceList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱","",JSON.toJSONString(doctorAdviceList),"",e.getMessage());
         }
     }
 
@@ -159,7 +159,7 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 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/AHomeDiagnoseInfoFacade.java

@@ -64,11 +64,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());
         }
     }
@@ -102,7 +102,7 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(homeDiagnoseList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断","",JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
         }
 
     }
@@ -130,7 +130,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

@@ -98,7 +98,7 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术",JSON.toJSONString(homeOperationList),"","操作正常!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术",JSON.toJSONString(homeOperationList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术","",JSON.toJSONString(homeOperationList),"",e.getMessage());
         }
     }
 
@@ -125,7 +125,7 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                 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/AHomePageFacade.java

@@ -113,11 +113,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());
             if(e.getMessage().contains("该病历无关联的质控条目")){
                 return RespDTO.onSuc(e.getMessage());
             }else {
@@ -225,7 +225,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             execute(homePageList);
             //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
         }
     }
 
@@ -282,7 +282,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 return RespDTO.onSuc(map);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
             if(e.getMessage().contains("该病历无关联的质控条目")){
                 return RespDTO.onSuc(e.getMessage());
             }else {
@@ -334,11 +334,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());
         }
     }
@@ -377,7 +377,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(homePageList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(homePageList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(homePageList),"",e.getMessage());
         }
     }
 
@@ -403,7 +403,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 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/AMedCrisisFacade.java

@@ -69,11 +69,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());
         }
     }
@@ -106,7 +106,7 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(medCrisisList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(medCrisisList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值","",JSON.toJSONString(medCrisisList),"",e.getMessage());
         }
     }
 
@@ -133,7 +133,7 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
                 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/AMedLisInfoFacade.java

@@ -74,7 +74,7 @@ public class AMedLisInfoFacade extends MedLisInfoServiceImpl {
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("检验信息-保存异常",JSON.toJSONString(medLisInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验信息-保存异常","",JSON.toJSONString(medLisInfoList),"",e.getMessage());
         }
     }
 
@@ -98,7 +98,7 @@ public class AMedLisInfoFacade extends MedLisInfoServiceImpl {
                 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/AMedLisResultFacade.java

@@ -70,11 +70,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());
         }
     }
@@ -106,7 +106,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());
         }
     }
 
@@ -130,7 +130,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/AMedNurseFacade.java

@@ -72,7 +72,7 @@ public class AMedNurseFacade extends MedNurseServiceImpl {
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("护理信息-保存异常",JSON.toJSONString(medNurseList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("护理信息-保存异常","",JSON.toJSONString(medNurseList),"",e.getMessage());
         }
     }
 
@@ -96,7 +96,7 @@ public class AMedNurseFacade extends MedNurseServiceImpl {
                 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/AMedPacsInfoFacade.java

@@ -73,7 +73,7 @@ public class AMedPacsInfoFacade extends MedPacsInfoServiceImpl {
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("检查信息-保存异常",JSON.toJSONString(medPacsInfoList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查信息-保存异常","",JSON.toJSONString(medPacsInfoList),"",e.getMessage());
         }
     }
 
@@ -97,7 +97,7 @@ public class AMedPacsInfoFacade extends MedPacsInfoServiceImpl {
                 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/AMedPacsResultFacade.java

@@ -70,11 +70,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());
         }
     }
@@ -105,7 +105,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());
         }
     }
 
@@ -129,7 +129,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/AMedicalRecordContentFacade.java

@@ -58,11 +58,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());
         }
 
@@ -96,7 +96,7 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
             }*/
             //aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(mrContentList),"","操作成功!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(mrContentList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容","",JSON.toJSONString(mrContentList),"",e.getMessage());
         }
     }
 
@@ -120,7 +120,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

@@ -113,11 +113,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(list, AMedicalRecordDTO.class);
                 return RespDTO.onSuc(medicalRecordDTOList);
             }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());
         }
     }
@@ -166,11 +166,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 //评分后返回结构体
                 return mrIng(aMrContentVO);
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),"","未接收到数据!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息","",JSON.toJSONString(aMrContentVO),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息","",JSON.toJSONString(aMrContentVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
@@ -240,7 +240,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 return RespDTO.onSuc(map);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(aMrContentVO),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息","",JSON.toJSONString(aMrContentVO),"",e.getMessage());
             if(e.getMessage().contains("该病历无关联的质控条目")){
                 return RespDTO.onSuc(e.getMessage());
             }else {
@@ -312,7 +312,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(medicalRecordList),"","操作正常!");
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息",JSON.toJSONString(medicalRecordList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息","",JSON.toJSONString(medicalRecordList),"",e.getMessage());
         }
     }
 
@@ -408,7 +408,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             //aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-初始化modeId",JSON.toJSONString(medicalRecord),modeId.toString(),"操作成功!");
             return modeId;
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-初始化modeId",JSON.toJSONString(medicalRecord),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-初始化modeId",medicalRecord.getRecId(), JSON.toJSONString(medicalRecord),"",e.getMessage());
             return modeId;
         }
 
@@ -447,7 +447,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 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/service/impl/MedPacsResultServiceImpl.java

@@ -1,6 +1,7 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.MedPacsResultDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.MedPacsResult;
 import com.diagbot.mapper.MedPacsResultMapper;
@@ -20,7 +21,7 @@ import java.util.List;
 @Service
 public class MedPacsResultServiceImpl extends ServiceImpl<MedPacsResultMapper, MedPacsResult> implements MedPacsResultService {
     @Override
-    public List<MedPacsResult> getMedPacsResults(BehospitalInfo behospitalInfo) {
+    public List<MedPacsResultDTO> getMedPacsResults(BehospitalInfo behospitalInfo) {
         return baseMapper.getMedPacsResults(behospitalInfo);
     }
 

src/main/java/com/diagbot/util/YWAnalysis.java

@@ -154,7 +154,7 @@ public class YWAnalysis {
             //behospitalInfo.setPlacefileDate();
         } catch (Exception e) {
             e.printStackTrace();
-            aMedAbnormalInfoFacade.saveAbnormalInfo("socketMsg病人住院登记", JSON.toJSONString(hisMessage), "", e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("socketMsg病人住院登记","", JSON.toJSONString(hisMessage), "", e.getMessage());
         }
         behospitalInfoList.add(behospitalInfo);
         return behospitalInfoList;

src/main/java/com/diagbot/vo/data/AMrContentVO.java

@@ -13,6 +13,8 @@ public class AMrContentVO {
     @NotBlank(message = "对接模式类型编码不能为空")
     private String dockModeType;//对接模式类型编码，1:页面模式，2：接口引擎模式
 
+    private String transcode;
+
     private String title;
 
     private List<AMedicalRecordVO> records;

src/main/resources/application-local.yml

@@ -59,7 +59,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://127.0.0.1:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://172.17.14.227:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息
@@ -111,9 +111,9 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 127.0.0.1  #Redis服务器地址
+    host: 172.17.14.227  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password:  # Redis服务器连接密码（默认为空）
+    password: lantone  # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）

src/main/resources/logback-spring.xml

@@ -263,7 +263,7 @@
             <appender-ref ref="WARN"/>
             <appender-ref ref="INFO"/>
             <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
+            <!--<appender-ref ref="STDOUT"/>-->
             <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>