厦门新增参数modeName，emrTitlt

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

@@ -70,10 +70,10 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl {
         if (medCrisisList != null && medCrisisList.size() > 0) {
             medCrisisList.forEach(s -> {
 
-                HisViewVo hisViewVo = new HisViewVo();
-                BeanUtils.copyProperties(s,hisViewVo);
-                aMedicalRecordContentFacade.executeByView(hisViewVo);
-                aMedicalRecordFacade.executeByView(hisViewVo,"23");
+//                HisViewVo hisViewVo = new HisViewVo();
+//                BeanUtils.copyProperties(s,hisViewVo);
+//                aMedicalRecordContentFacade.executeByView(hisViewVo);
+//                aMedicalRecordFacade.executeByView(hisViewVo,"23");
 
                 try {
                     MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()

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

@@ -95,6 +95,33 @@ public class DeleteFlagFacade {
     @Autowired
     private MedPacsInfoFacade medPacsInfoFacade;
 
+    public void isDeleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        if (!aDeleteFlagVO.getModeName().isEmpty()){
+            aDeleteFlagVO = isModeId(aDeleteFlagVO);
+            if (aDeleteFlagVO.getModeId().equals("0")){
+                String recId=aDeleteFlagVO.getRecId();
+                String[] modeList={"23","31","32"};
+                for(String modeId:modeList){
+                    aDeleteFlagVO.setModeId(modeId);
+                    aDeleteFlagVO.setRecId(recId+"-"+aDeleteFlagVO.getModeId());
+                    deleteFlag(aDeleteFlagVO);
+                }
+            }else if (aDeleteFlagVO.getModeId().equals("34")){
+                String recId=aDeleteFlagVO.getRecId();
+                String[] modeList={"26","27"};
+                for(String modeId:modeList){
+                    aDeleteFlagVO.setModeId(modeId);
+                    aDeleteFlagVO.setRecId(recId+"-"+aDeleteFlagVO.getModeId());
+                    deleteFlag(aDeleteFlagVO);
+                }
+            }else {
+                aDeleteFlagVO.setRecId(aDeleteFlagVO.getRecId()+"-"+aDeleteFlagVO.getModeId());
+                deleteFlag(aDeleteFlagVO);
+            }
+        }else {
+            deleteFlag(aDeleteFlagVO);
+        }
+    }
 
 
     public void deleteFlag(ADeleteFlagVO aDeleteFlagVO){
@@ -166,4 +193,61 @@ public class DeleteFlagFacade {
         }
 
     }
+
+
+
+    public ADeleteFlagVO isModeId(ADeleteFlagVO aDeleteFlagVO){
+        String modeName=aDeleteFlagVO.getModeName();
+        String modeId="0";
+        if (modeName.equals("入院记录")){
+            modeId="1";
+        }else if (modeName.equals("首次病程记录")){
+            modeId="2";
+        }else if (modeName.equals("死亡病例讨论记录")){
+            modeId="3";
+        }else if (modeName.equals("上级医师查房记录")|| modeName.equals("日常病程记录")){
+            modeId="4";
+        }else if (modeName.equals("出院小结")||modeName.equals("出院记录")){
+            modeId="5";
+        }else if (modeName.equals("住院病案首页")||modeName.equals("中医住院病案首页")){
+            modeId="6";
+        }else if (modeName.equals("会诊记录")){
+            modeId="7";
+        }else if (modeName.equals("住院医嘱")){
+            modeId="8";
+        }else if (modeName.equals("输血记录")){
+            modeId="10";
+        }else if (modeName.equals("术前小结")||modeName.equals("术前讨论")){
+            modeId="11";
+        }else if (modeName.equals("一般手术记录")){
+            modeId="17";
+        }else if (modeName.equals("术后首次病程记录")){
+            modeId="18";
+        }else if (modeName.equals("疑难病例讨论记录")){
+            modeId="19";
+        }else if (modeName.equals("抢救记录")){
+            modeId="22";
+        }else if (modeName.equals("死亡记录")){
+            modeId="24";
+        }else if (modeName.equals("病危通知书")){
+            modeId="25";
+        }else if (modeName.equals("转科记录")){
+            modeId="34";
+        }else if (modeName.equals("阶段小结")){
+            modeId="28";
+        }else if (modeName.equals("病重通知书")){
+            modeId="29";
+        }else if (modeName.equals("检查报告")){
+            modeId="57";
+        }else if (modeName.equals("检验记录")){
+            modeId="58";
+        }else if (modeName.contains("告知书")){
+            modeId="53";
+        }else if (modeName.contains("同意书")){
+            modeId="54";
+        }
+        aMedAbnormalInfoFacade.saveAbnormalInfo("删除文书his入参", aDeleteFlagVO.getRecId(),JSON.toJSONString(aDeleteFlagVO),"","");
+        aDeleteFlagVO.setModeId(modeId);
+        return aDeleteFlagVO;
+    }
 }

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

@@ -119,21 +119,47 @@ public class StructuralDataFacade {
                 return RespDTO.onError("请输入医院编码!");
             } else if (StringUtils.isEmpty(structuralDataVos.getRecId())) {
                 return RespDTO.onError("请输入文书id");
-            } else if (StringUtils.isEmpty(structuralDataVos.getModeId())) {
-                return RespDTO.onError("请输入文书类别名称");
             }
-            long time1 = System.currentTimeMillis();
+
             //装载数据
-            execute(structuralDataVos);
+            long time1 = System.currentTimeMillis();
+            if (!structuralDataVos.getModeName().isEmpty()){
+                structuralDataVos = isModeId(structuralDataVos);
+                if (structuralDataVos.getModeId().equals("0")){
+                    String recId=structuralDataVos.getRecId();
+                    String[] modeList={"23","31","32"};
+                    for(String modeId:modeList){
+                        structuralDataVos.setModeId(modeId);
+                        structuralDataVos.setRecId(recId+"-"+structuralDataVos.getModeId());
+                        execute(structuralDataVos);
+                    }
+                }else if (structuralDataVos.getModeId().equals("34")){
+                    String recId=structuralDataVos.getRecId();
+                    String[] modeList={"26","27"};
+                    for(String modeId:modeList){
+                        structuralDataVos.setModeId(modeId);
+                        structuralDataVos.setRecId(recId+"-"+structuralDataVos.getModeId());
+                        execute(structuralDataVos);
+                    }
+                }else {
+                    structuralDataVos.setRecId(structuralDataVos.getRecId()+"-"+structuralDataVos.getModeId());
+                    execute(structuralDataVos);
+                }
+            }else {
+                execute(structuralDataVos);
+            }
+
             long time2 = System.currentTimeMillis();
             System.out.println("装载数据所耗时为-----"+(time2-time1));
-//
-            String[] modeList={"8","10","53","54","57","58","59","60","55","23"};
-            for (String modeId: modeList ) {
+
+            //判断是否有质控条目
+            String[] modes={"8","10","53","54","57","58","59","60","55","23"};
+            for (String modeId: modes ) {
                 if (modeId.equals(structuralDataVos.getModeId())){
                     return RespDTO.onSuc("该模块没有质控条目");
                 }
             }
+
             //返回评分结构体
             RespDTO<Map<String, Object>> msg= mrIng(structuralDataVos);
             long time3 = System.currentTimeMillis();
@@ -373,8 +399,6 @@ public class StructuralDataFacade {
 
     }
 
-
-
     /**
      * 评分后返回结构体
      *
@@ -430,4 +454,62 @@ public class StructuralDataFacade {
     }
 
 
+    public StructuralDataVo isModeId(StructuralDataVo structuralDataVo){
+        String modeName=structuralDataVo.getModeName();
+        String modeId="0";
+        if (modeName.equals("入院记录")){
+            modeId="1";
+        }else if (modeName.equals("首次病程记录")){
+            modeId="2";
+        }else if (modeName.equals("死亡病例讨论记录")){
+            modeId="3";
+        }else if (modeName.equals("上级医师查房记录")|| modeName.equals("日常病程记录")){
+            modeId="4";
+        }else if (modeName.equals("出院小结")||modeName.equals("出院记录")){
+            modeId="5";
+        }else if (modeName.equals("住院病案首页")||modeName.equals("中医住院病案首页")){
+            modeId="6";
+        }else if (modeName.equals("会诊记录")){
+            modeId="7";
+        }else if (modeName.equals("住院医嘱")){
+            modeId="8";
+        }else if (modeName.equals("输血记录")){
+            modeId="10";
+        }else if (modeName.equals("术前小结")||modeName.equals("术前讨论")){
+            modeId="11";
+        }else if (modeName.equals("一般手术记录")){
+            modeId="17";
+        }else if (modeName.equals("术后首次病程记录")){
+            modeId="18";
+        }else if (modeName.equals("疑难病例讨论记录")){
+            modeId="19";
+        }else if (modeName.equals("抢救记录")){
+            modeId="22";
+        }else if (modeName.equals("死亡记录")){
+            modeId="24";
+        }else if (modeName.equals("病危通知书")){
+            modeId="25";
+        }else if (modeName.equals("转科记录")){
+            modeId="34";
+        }else if (modeName.equals("阶段小结")){
+            modeId="28";
+        }else if (modeName.equals("病重通知书")){
+            modeId="29";
+        }else if (modeName.equals("检查报告")){
+            modeId="57";
+        }else if (modeName.equals("检验记录")){
+            modeId="58";
+        }else if (modeName.contains("告知书")){
+            modeId="53";
+        }else if (modeName.contains("同意书")){
+            modeId="54";
+        }else {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("没有匹配到文书类别", structuralDataVo.getRecId(),structuralDataVo.getModeName(),"","");
+        }
+        aMedAbnormalInfoFacade.saveAbnormalInfo("his入参", structuralDataVo.getRecId(),JSON.toJSONString(structuralDataVo),"","");
+        structuralDataVo.setModeId(modeId);
+        return structuralDataVo;
+    }
+
+
 }

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

@@ -10,6 +10,14 @@ public class ADeleteFlagVO {
      * 模板id(用于判断传过来的数据为那个类型)
      */
     private String modeId;
+    /**
+     * 模板类型名称
+     */
+    private String modeName;
+    /**
+     * 文书名称
+     */
+    private String emrTitle;
 
     private String modeType;
     /**

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

@@ -44,6 +44,15 @@ public class StructuralDataVo {
      * 所对应的模板
      */
     private String modeId;
+    /**
+     * 模板名称
+     */
+    private  String modeName;
+
+    /**
+     * 文书名称
+     */
+    private String emrTitle;
 
     private String dockModeType;//对接模式类型编码，1:页面模式，2：接口引擎模式
 

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

@@ -171,7 +171,7 @@ public class DataController {
     @PostMapping("/deleteFlag")
     @SysLogger("deleteFlag")
     public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO){
-        deleteFlagFacade.deleteFlag(aDeleteFlagVO);
+        deleteFlagFacade.isDeleteFlag(aDeleteFlagVO);
         return RespDTO.onSuc(true);
     }