Преглед изворни кода

添加部分方法日志记录

shiyue пре 3 година
родитељ
комит
9f804de391

+ 4 - 1
src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -275,9 +275,11 @@ public class AHomePageFacade extends HomePageServiceImpl{
             }
             if(addE.size()>0){
                 homePageService.saveBatch(addE);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","", JSON.toJSONString(homePageList),"","新增病案首页");
             }
             if(updateE.size()>0){
                 homePageService.updateBatchByKey(updateE);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","", JSON.toJSONString(homePageList),"","更新病案首页");
             }
 
         }catch (Exception e){
@@ -304,7 +306,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                         .set("is_deleted",IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
                 Boolean flag=update(new HomePage(),updateWrapper);
-                //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!","");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
@@ -355,6 +357,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             homePage.setLeaveHospitalDate(DateUtil.parseDateTime(homePageVO.getLeaveHospitalDate()));//出院时间
             homePage.setBirthday(DateUtil.parseDate(homePageVO.getBirthday()));//出生日期
             homePage.setQcDate(DateUtil.parseDateTime(homePageVO.getQcDate()));//质控日期
+            homePage.setIsDeleted("N");
 
             List<HomePage> list1=new ArrayList<>();
             list1.add(homePage);

+ 97 - 97
src/main/java/com/diagbot/facade/data/DeleteFlagFacade.java

@@ -95,161 +95,161 @@ public class DeleteFlagFacade {
     @Autowired
     private MedPacsInfoFacade medPacsInfoFacade;
 
-    public void isDeleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        if (!aDeleteFlagVO.getModeName().isEmpty()){
+    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){
+            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());
+                    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){
+            } 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());
+                    aDeleteFlagVO.setRecId(recId + "-" + aDeleteFlagVO.getModeId());
                     deleteFlag(aDeleteFlagVO);
                 }
-            }else {
-                aDeleteFlagVO.setRecId(aDeleteFlagVO.getRecId()+"-"+aDeleteFlagVO.getModeId());
+            } else {
+                aDeleteFlagVO.setRecId(aDeleteFlagVO.getRecId() + "-" + aDeleteFlagVO.getModeId());
                 deleteFlag(aDeleteFlagVO);
             }
-        }else {
+        } else {
             deleteFlag(aDeleteFlagVO);
         }
     }
 
 
-    public void deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+    public void deleteFlag(ADeleteFlagVO aDeleteFlagVO) {
         aDeleteFlagVO.setHomePageId(aDeleteFlagVO.getRecId());
         aDeleteFlagVO.setDoctorAdviceId(aDeleteFlagVO.getRecId());
 
         String modelName = ModeIdEnum.getName(Integer.parseInt(aDeleteFlagVO.getModeId()));
+        aMedAbnormalInfoFacade.saveAbnormalInfo("删除" + modelName, aDeleteFlagVO.getRecId(), JSON.toJSONString(aDeleteFlagVO), "", "");
         try {
-            if("入院记录".equals(modelName)){
+            if ("入院记录".equals(modelName)) {
                 aStrAdmissionNoteFacade.deleteFlag(aDeleteFlagVO);
-            }else if("首次病程录".equals(modelName)){
+            } else if ("首次病程录".equals(modelName)) {
                 aStrFirstRecordFacade.deleteFlag(aDeleteFlagVO);
-            }else if("输血后效果评价".equals(modelName)){
+            } else if ("输血后效果评价".equals(modelName)) {
                 aStrBloodResultFacade.deleteFlag(aDeleteFlagVO);
-            }else if("输血/血制品病程记录".equals(modelName)){
+            } else if ("输血/血制品病程记录".equals(modelName)) {
                 aStrBloodTransfusionFacade.deleteFlag(aDeleteFlagVO);
-            }else if("转入记录".equals(modelName)){
+            } else if ("转入记录".equals(modelName)) {
                 aStrTransferInNoteFacade.deleteFlag(aDeleteFlagVO);
-            }else if("转出记录".equals(modelName)){
+            } else if ("转出记录".equals(modelName)) {
                 aStrTransferOutNoteFacade.deleteFlag(aDeleteFlagVO);
-            }else if("病危通知书".equals(modelName)){
+            } else if ("病危通知书".equals(modelName)) {
                 aStrIllCriticallyFacade.deleteFlag(aDeleteFlagVO);
-            }else if("病重通知书".equals(modelName)){
+            } else if ("病重通知书".equals(modelName)) {
                 aStrIllSeriouslFacade.deleteFlag(aDeleteFlagVO);
-            }else if("疑难病例讨论记录".equals(modelName)){
+            } else if ("疑难病例讨论记录".equals(modelName)) {
                 aStrDifficultCaseFacade.deleteFlag(aDeleteFlagVO);
-            }else if("死亡记录".equals(modelName)){
+            } else if ("死亡记录".equals(modelName)) {
                 aStrDeathNoteFacade.deleteFlag(aDeleteFlagVO);
-            }else if("死亡病例讨论记录".equals(modelName)){
+            } else if ("死亡病例讨论记录".equals(modelName)) {
                 aStrDeathDiscussionFacade.deleteFlag(aDeleteFlagVO);
-            }else if("查房记录".equals(modelName)){
+            } else if ("查房记录".equals(modelName)) {
                 aStrWardRecordFacade.deleteFlag(aDeleteFlagVO);
-            }else if("术后首次病程及谈话记录".equals(modelName)){
+            } else if ("术后首次病程及谈话记录".equals(modelName)) {
                 aStrOperativeFirstRecord.deleteFlag(aDeleteFlagVO);
-            }else if("术前讨论、术前小结".equals(modelName)){
+            } else if ("术前讨论、术前小结".equals(modelName)) {
                 aStrPreoperativeDiscussionFacade.deleteFlag(aDeleteFlagVO);
-            }else if("手术记录".equals(modelName)){
+            } else if ("手术记录".equals(modelName)) {
                 aStrOperativeNoteFacade.deleteFlag(aDeleteFlagVO);
-            }else if("抢救记录".equals(modelName)){
+            } else if ("抢救记录".equals(modelName)) {
                 aStrRescueNoteFacade.deleteFlag(aDeleteFlagVO);
-            }else if("危急值记录".equals(modelName)){
+            } else if ("危急值记录".equals(modelName)) {
                 aStrCrisisNoteFacade.deleteFlag(aDeleteFlagVO);
-            }else if("出院小结".equals(modelName)){
+            } else if ("出院小结".equals(modelName)) {
                 aStrLeaveHospitalFacade.deleteFlag(aDeleteFlagVO);
-            }else if("会诊申请单".equals(modelName)){
+            } else if ("会诊申请单".equals(modelName)) {
                 aStrConsultationResultFacade.deleteFlag(aDeleteFlagVO);
-            }else if ("会诊记录".equals(modelName)){
+            } else if ("会诊记录".equals(modelName)) {
                 aStrConsultationRecordFacade.deleteFlag(aDeleteFlagVO);
-            } else if("阶段小结".equals(modelName)){
+            } else if ("阶段小结".equals(modelName)) {
                 aStrPeriodConclusionFacade.deleteFlag(aDeleteFlagVO);
-            }else if ("病案首页".equals(modelName)){
+            } else if ("病案首页".equals(modelName)) {
                 aHomePageFacade.deleteFlag(aDeleteFlagVO);//病案首页
-            }else if ("医嘱信息".equals(modelName)){
+            } else if ("医嘱信息".equals(modelName)) {
                 aDoctorAdviceFacade.deleteFlag(aDeleteFlagVO);
-            }else if ("入院登记".equals(modelName)){
+            } else if ("入院登记".equals(modelName)) {
                 aBehospitalInfoFacade.deleteFlag(aDeleteFlagVO);
-            }else if ("检查信息".equals(modelName)){
+            } else if ("检查信息".equals(modelName)) {
                 medPacsInfoFacade.deleteFlag(aDeleteFlagVO);
                 aMedPacsResultFacade.deleteFlag(aDeleteFlagVO);
-            }else if ("检验信息".equals(modelName)){
+            } else if ("检验信息".equals(modelName)) {
                 medLisInfoFacade.deleteFlag(aDeleteFlagVO);
                 aMedLisResultFacade.deleteFlag(aDeleteFlagVO);
             }
 
-            if (null !=aDeleteFlagVO.getRecId()){
+            if (null != aDeleteFlagVO.getRecId()) {
                 aMedicalRecordFacade.deleteFlag(aDeleteFlagVO);
             }
 
-        }catch(Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("删除数据异常", "", JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("删除数据异常", "", JSON.toJSONString(aDeleteFlagVO), "", e.getMessage());
         }
 
     }
 
 
-
-    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";
+    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),"","");
+        aMedAbnormalInfoFacade.saveAbnormalInfo("删除文书his入参", aDeleteFlagVO.getRecId(), JSON.toJSONString(aDeleteFlagVO), "", "");
         aDeleteFlagVO.setModeId(modeId);
         return aDeleteFlagVO;
     }

+ 252 - 223
src/main/java/com/diagbot/facade/data/StructuralDataFacade.java

@@ -112,10 +112,10 @@ public class StructuralDataFacade {
 
 
     public RespDTO<Map<String, Object>> sendStructuralData(StructuralDataVo structuralDataVos) {
-        if (structuralDataVos!=null) {
+        if (structuralDataVos != null) {
             if (StringUtils.isEmpty(structuralDataVos.getBehospitalCode())) {
                 return RespDTO.onError("请输入病历号!");
-            } else if (null==structuralDataVos.getHospitalId()) {
+            } else if (null == structuralDataVos.getHospitalId()) {
                 return RespDTO.onError("请输入医院编码!");
             } else if (StringUtils.isEmpty(structuralDataVos.getRecId())) {
                 return RespDTO.onError("请输入文书id");
@@ -123,192 +123,215 @@ public class StructuralDataFacade {
 
             //装载数据
             long time1 = System.currentTimeMillis();
-            if (!structuralDataVos.getModeName().isEmpty()){
+            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){
+                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());
+                        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){
+                } 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());
+                        structuralDataVos.setRecId(recId + "-" + structuralDataVos.getModeId());
                         execute(structuralDataVos);
                     }
-                }else {
-                    structuralDataVos.setRecId(structuralDataVos.getRecId()+"-"+structuralDataVos.getModeId());
+                } else {
+                    structuralDataVos.setRecId(structuralDataVos.getRecId() + "-" + structuralDataVos.getModeId());
                     execute(structuralDataVos);
                 }
-            }else {
+            } else {
                 execute(structuralDataVos);
             }
 
             long time2 = System.currentTimeMillis();
-            System.out.println("装载数据所耗时为-----"+(time2-time1));
+            System.out.println("装载数据所耗时为-----" + (time2 - time1));
 
             //判断是否有质控条目
-            String[] modes={"8","10","53","54","57","58","59","60","55","23"};
-            for (String modeId: modes ) {
-                if (modeId.equals(structuralDataVos.getModeId())){
+            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);
+            RespDTO<Map<String, Object>> msg = mrIng(structuralDataVos);
             long time3 = System.currentTimeMillis();
-            System.out.println("评分所耗时为--------"+(time3-time2));
+            System.out.println("评分所耗时为--------" + (time3 - time2));
 
             return msg;
-        }else {
+        } else {
             return RespDTO.onError("未接收到数据!");
         }
 
     }
 
 
-
-
     /**
      * 判断所属模板再保存
+     *
      * @param s
      */
-    public void execute(StructuralDataVo s){
-            String modelName = ModeIdEnum.getName(Integer.parseInt(s.getModeId()));
-            s.setTableName(TableNameEnum.getName(Integer.parseInt(s.getModeId())));
+    public void execute(StructuralDataVo s) {
+        String modelName = ModeIdEnum.getName(Integer.parseInt(s.getModeId()));
+        s.setTableName(TableNameEnum.getName(Integer.parseInt(s.getModeId())));
         try {
-            if("首次病程录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrFirstRecordFacade.getOneList(hisViewVos,s.getModeId());
+            if ("首次病程录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrFirstRecordFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("输血后效果评价".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrBloodResultFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("输血后效果评价".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrBloodResultFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("输血/血制品病程记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrBloodTransfusionFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("输血/血制品病程记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrBloodTransfusionFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("转入记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrTransferInNoteFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("转入记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrTransferInNoteFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("转出记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrTransferOutNoteFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("转出记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrTransferOutNoteFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("病危通知书".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrIllCriticallyFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("病危通知书".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrIllCriticallyFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("病重通知书".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrIllSeriouslFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("病重通知书".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrIllSeriouslFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("疑难病例讨论记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrDifficultCaseFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("疑难病例讨论记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrDifficultCaseFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("死亡记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrDeathNoteFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("死亡记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrDeathNoteFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("死亡病例讨论记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getMedDeathDiscussion(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrDeathDiscussionFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("死亡病例讨论记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getMedDeathDiscussion(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrDeathDiscussionFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("术后首次病程及谈话记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrOperativeFirstRecord.getOneList(hisViewVos,s.getModeId());
+            } else if ("术后首次病程及谈话记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrOperativeFirstRecord.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("术前讨论、术前小结".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrPreoperativeDiscussionFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("术前讨论、术前小结".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrPreoperativeDiscussionFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("手术记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrOperativeNoteFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("手术记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrOperativeNoteFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("抢救记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrRescueNoteFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("抢救记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrRescueNoteFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("出院小结".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrLeaveHospitalFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("出院小结".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrLeaveHospitalFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("会诊申请单".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrConsultationResultFacade.getOneList(hisViewVos,"31");
+            } else if ("会诊申请单".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrConsultationResultFacade.getOneList(hisViewVos, "31");
                 }
-            }else if ("会诊记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrConsultationRecordFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("会诊记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrConsultationRecordFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            } else if("阶段小结".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrPeriodConclusionFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("阶段小结".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrPeriodConclusionFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if("查房记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrWardRecordFacade.getOneList(hisViewVos,s.getModeId());
+            } else if ("查房记录".equals(modelName)) {
+                List<HisViewVo> hisViewVos = fjtzdbConnHarp.getHisView(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(hisViewVos), "");
+                if (hisViewVos.size() > 0) {
+                    aStrWardRecordFacade.getOneList(hisViewVos, s.getModeId());
                 }
-            }else if ("病案首页".equals(modelName)){
+            } else if ("病案首页".equals(modelName)) {
                 /**
                  * 病案首页
                  */
-                String sql ="select * from "+s.getTableName()+" where  behospitalCode='"+ s.getBehospitalCode()+
-                        "' and homePageId='"+s.getRecId()+"' and patientId='"+s.getPatientId()+ "'";
-                List<HisHomePageVO> homePage =fjtzdbConnHarp.getHomePage(sql);
-                if (homePage.size()>0) {
+                String sql = "select * from " + s.getTableName() + " where  behospitalCode='" + s.getBehospitalCode() +
+                        "' and homePageId='" + s.getRecId() + "' and patientId='" + s.getPatientId() + "'";
+                List<HisHomePageVO> homePage = fjtzdbConnHarp.getHomePage(sql);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), sql, JSON.toJSONString(homePage), "");
+                if (homePage.size() > 0) {
                     aHomePageFacade.getOneList(homePage);//病案首页
 
                     /**
                      * 病案首页诊断
                      */
-                    String sql01="select * from  med_home_diagnose_info  where "+"homePageId='"+s.getRecId()+"'" ;
-                    List<HomeDiagnoseInfo> homeDiagnoseInfos =fjtzdbConnHarp.getHomeDiagnose(sql01);
-                    if (homeDiagnoseInfos.size()>0) {
+                    String sql01 = "select * from  med_home_diagnose_info  where " + "homePageId='" + s.getRecId() + "'";
+                    List<HomeDiagnoseInfo> homeDiagnoseInfos = fjtzdbConnHarp.getHomeDiagnose(sql01);
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("查询病案首页诊断视图", s.getRecId(), sql01, JSON.toJSONString(homeDiagnoseInfos), "");
+
+                    if (homeDiagnoseInfos.size() > 0) {
                         aHomeDiagnoseInfoFacade.execute(homeDiagnoseInfos);//病案首页诊断
                     }
                     /**
                      * 病案首页手术及操作
                      */
                     List<HomeOperationInfo> homeinfo = new ArrayList<>();
-                    String sql02 = "select * from  med_home_operation_info  where " + " homePageId='" + homePage.get(0).getHomePageId() + "' and behospitalCode = '"+s.getBehospitalCode()+"' and patientId='"+s.getPatientId()+ "'";
+                    String sql02 = "select * from  med_home_operation_info  where " + " homePageId='" + homePage.get(0).getHomePageId() + "' and behospitalCode = '" + s.getBehospitalCode() + "' and patientId='" + s.getPatientId() + "'";
                     List<HomeOperationInfo> homeOperationInfos = fjtzdbConnHarp.getHomeOperation(sql02);
-                    if (homeOperationInfos.size()>0){
-                        homeOperationInfos.forEach(h->{
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("查询病案首页手术及操作视图", s.getRecId(), sql02, JSON.toJSONString(homeOperationInfos), "");
+                    if (homeOperationInfos.size() > 0) {
+                        homeOperationInfos.forEach(h -> {
                             homeinfo.add(h);
                         });
                     }
-                    String sql03 = "select * from  med_home_operation_info2  where " + "homePageId='" + homePage.get(0).getHomePageId() + "' and behospitalCode = '"+s.getBehospitalCode()+"' and patientId='"+s.getPatientId()+ "'";
+                    String sql03 = "select * from  med_home_operation_info2  where " + "homePageId='" + homePage.get(0).getHomePageId() + "' and behospitalCode = '" + s.getBehospitalCode() + "' and patientId='" + s.getPatientId() + "'";
                     List<HomeOperationInfo> homeOperation = fjtzdbConnHarp.getHomeOperation(sql03);
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("查询病案首页手术及操作视图", s.getRecId(), sql03, JSON.toJSONString(homeOperation), "");
                     if (homeOperation.size() > 0) {
                         homeOperation.forEach(home -> {
                             homeinfo.add(home);
@@ -316,85 +339,90 @@ public class StructuralDataFacade {
                     }
                     aHomeOperationInfoFacade.execute(homeinfo);//病案首页手术
                 }
-            }else if ("医嘱信息".equals(modelName)){
-                String sql="select * from  med_doctor_advice  where "+" behospitalCode='"+s.getBehospitalCode()+
-                        "' and doctorAdviceId='"+s.getRecId()+"' and patientId='"+s.getPatientId()+ "'";
-                List<DoctorAdvice> doctorAdvice =fjtzdbConnHarp.getDoctorAdvice(sql);
-                if (doctorAdvice.size()>0){
+            } else if ("医嘱信息".equals(modelName)) {
+                String sql = "select * from  med_doctor_advice  where " + " behospitalCode='" + s.getBehospitalCode() +
+                        "' and doctorAdviceId='" + s.getRecId() + "' and patientId='" + s.getPatientId() + "'";
+                List<DoctorAdvice> doctorAdvice = fjtzdbConnHarp.getDoctorAdvice(sql);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), sql, JSON.toJSONString(doctorAdvice), "");
+                if (doctorAdvice.size() > 0) {
                     aDoctorAdviceFacade.execute(doctorAdvice);
                 }
-            }else if ("入院登记".equals(modelName)) {
-                String sql = "select * from " + s.getTableName() + "   where  behospitalCode='" + s.getBehospitalCode() +"' and patientId='"+s.getPatientId()+ "'";
+            } else if ("入院登记".equals(modelName)) {
+                String sql = "select * from " + s.getTableName() + "   where  behospitalCode='" + s.getBehospitalCode() + "' and patientId='" + s.getPatientId() + "'";
                 List<BehospitalInfo> behospitalInfo = fjtzdbConnHarp.getBehospitalInfo(sql);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), sql, JSON.toJSONString(behospitalInfo), "");
                 if (behospitalInfo.size() > 0) {
                     aBehospitalInfoFacade.execute(behospitalInfo);
                 }
-            }
-            else if ("检查信息".equals(modelName)){
-                String sql ="select * from med_pacs_info where behospitalCode ='"+s.getBehospitalCode()+
-                        "' and recId = '"+s.getRecId()+"' and patientId='"+s.getPatientId()+ "'";
+            } else if ("检查信息".equals(modelName)) {
+                String sql = "select * from med_pacs_info where behospitalCode ='" + s.getBehospitalCode() +
+                        "' and recId = '" + s.getRecId() + "' and patientId='" + s.getPatientId() + "'";
 
-                List<MedPacsInfo> pacsInfo =fjtzdbConnHarp.getPacsInfo(sql);
-                if (pacsInfo.size()>0){
-                    pacsInfo.forEach(pacs->{
+                List<MedPacsInfo> pacsInfo = fjtzdbConnHarp.getPacsInfo(sql);
+                if (pacsInfo.size() > 0) {
+                    pacsInfo.forEach(pacs -> {
                         medPacsInfoFacade.save(pacs);
                     });
-                    List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sql(s));
-                    if (pacsResult.size()>0){
+                    List<MedPacsResult> pacsResult = fjtzdbConnHarp.getPacsResult(this.sql(s));
+                    if (pacsResult.size() > 0) {
                         aMedPacsResultFacade.execute(pacsResult);
                     }
                 }
-            }else if ("检验信息".equals(modelName)){
-                String sql ="select * from med_lis_info where behospitalCode ='"+ s.getBehospitalCode()+
-                        "' and recId = '"+s.getRecId()+"' and patientId='"+s.getPatientId()+ "'";
+            } else if ("检验信息".equals(modelName)) {
+                String sql = "select * from med_lis_info where behospitalCode ='" + s.getBehospitalCode() +
+                        "' and recId = '" + s.getRecId() + "' and patientId='" + s.getPatientId() + "'";
 
-                List<MedLisInfo> lisInfo =fjtzdbConnHarp.getLisInfo(sql);
-                if (lisInfo.size()>0){
-                    lisInfo.forEach(lis->{
+                List<MedLisInfo> lisInfo = fjtzdbConnHarp.getLisInfo(sql);
+                if (lisInfo.size() > 0) {
+                    lisInfo.forEach(lis -> {
                         medLisInfoFacade.save(lis);
                     });
-                    List<MedLisResult> lisResult =fjtzdbConnHarp.getLisResult(this.sql(s));
-                    if (lisResult.size()>0){
+                    List<MedLisResult> lisResult = fjtzdbConnHarp.getLisResult(this.sql(s));
+                    if (lisResult.size() > 0) {
                         aMedLisResultFacade.execute(lisResult);
                     }
                 }
 
-            }
-            else if ("谈话告知书".equals(modelName)){
-                List<StrTalkInform> strTalkInforms =fjtzdbConnHarp.getStrTalkInform(this.sql(s));
-                if (strTalkInforms.size()>0){
+            } else if ("谈话告知书".equals(modelName)) {
+                List<StrTalkInform> strTalkInforms = fjtzdbConnHarp.getStrTalkInform(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(strTalkInforms), "");
+                if (strTalkInforms.size() > 0) {
                     aStrTalkInformFacade.execute(strTalkInforms);
                 }
-            }else if ("知情同意书".equals(modelName)){
-                List<StrInformedConsent> strInformedConsents =fjtzdbConnHarp.getStrInformedConsent(this.sql(s));
-                if (strInformedConsents.size()>0){
+            } else if ("知情同意书".equals(modelName)) {
+                List<StrInformedConsent> strInformedConsents = fjtzdbConnHarp.getStrInformedConsent(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(strInformedConsents), "");
+                if (strInformedConsents.size() > 0) {
                     aStrInformedConsentFacade.execute(strInformedConsents);
                 }
-            }else if ("危急值信息".equals(modelName)){
-                List<MedCrisisInfo> medCrisisInfos =fjtzdbConnHarp.getMedCrisisInfo(this.sql(s));
-                if (medCrisisInfos.size()>0){
+            } else if ("危急值信息".equals(modelName)) {
+                List<MedCrisisInfo> medCrisisInfos = fjtzdbConnHarp.getMedCrisisInfo(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(medCrisisInfos), "");
+                if (medCrisisInfos.size() > 0) {
                     aMedCrisisFacade.execute(medCrisisInfos);
                 }
-            }else if("入院记录".equals(modelName)){
+            } else if ("入院记录".equals(modelName)) {
                 long time11 = System.currentTimeMillis();
-                List<FJStrAdmissionNoteVo> medAdmissionNote =fjtzdbConnHarp.getMedAdmissionNote(this.sql(s));
+                List<FJStrAdmissionNoteVo> medAdmissionNote = fjtzdbConnHarp.getMedAdmissionNote(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(medAdmissionNote), "");
                 long time12 = System.currentTimeMillis();
-                System.out.println("查询时间为——————————————"+(time12-time11));
-                if (medAdmissionNote.size()>0){
-                    aStrAdmissionNoteFacade.getOneList(medAdmissionNote,s.getModeId());
+                System.out.println("查询时间为——————————————" + (time12 - time11));
+                if (medAdmissionNote.size() > 0) {
+                    aStrAdmissionNoteFacade.getOneList(medAdmissionNote, s.getModeId());
                     long time13 = System.currentTimeMillis();
-                    System.out.println("保存时间为————————————————"+(time13-time12));
+                    System.out.println("保存时间为————————————————" + (time13 - time12));
                 }
-            }else if("危急值记录".equals(modelName)){
-                List<AStrCrisisNoteVO> medCrisisNote =fjtzdbConnHarp.getMedCrisisNote(this.sql(s));
-                if (medCrisisNote.size()>0){
-                    aStrCrisisNoteFacade.dealData(medCrisisNote.get(0),s.getModeId());
+            } else if ("危急值记录".equals(modelName)) {
+                List<AStrCrisisNoteVO> medCrisisNote = fjtzdbConnHarp.getMedCrisisNote(this.sql(s));
+                aMedAbnormalInfoFacade.saveAbnormalInfo("查询" + modelName + "视图", s.getRecId(), this.sql(s), JSON.toJSONString(medCrisisNote), "");
+                if (medCrisisNote.size() > 0) {
+                    aStrCrisisNoteFacade.dealData(medCrisisNote.get(0), s.getModeId());
                 }
             }
-            log.info(modelName+"---- 保存数据完成!");
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("保存数据异常", "",JSON.toJSONString(s),"",e.getMessage());
+            log.info(modelName + "---- 保存数据完成!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("保存数据异常", "", JSON.toJSONString(s), "", e.getMessage());
         }
 
     }
@@ -410,7 +438,7 @@ public class StructuralDataFacade {
         Long hospitalId = structuralDataVos.getHospitalId();
         Long modeId = Long.valueOf(structuralDataVos.getModeId());
 
-        if (structuralDataVos.getModeId().equals("5")||structuralDataVos.getModeId().equals("1")){
+        if (structuralDataVos.getModeId().equals("5") || structuralDataVos.getModeId().equals("1")) {
             structuralDataVos.setModeId("63");
             execute(structuralDataVos);
         }
@@ -420,7 +448,7 @@ public class StructuralDataFacade {
             Map<String, Object> map = new HashMap<String, Object>();
             map.put("url", url);
             return RespDTO.onSuc(map);
-        }else{
+        } else {
             AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
             analyzeRunVO.setBehospitalCode(structuralDataVos.getBehospitalCode());
             analyzeRunVO.setHospitalId(hospitalId);
@@ -438,72 +466,73 @@ public class StructuralDataFacade {
 
     /**
      * 根据传来的信息编辑视图的sql语句
+     *
      * @param s
      * @return
      */
-    public String sql(StructuralDataVo s){
-        String sql ="select * from  "+s.getTableName()+
-                "  where behospitalCode='"+s.getBehospitalCode()+
-                "' and recId= '"+s.getRecId()+
-                "' and patientId='"+s.getPatientId()+ "'";
+    public String sql(StructuralDataVo s) {
+        String sql = "select * from  " + s.getTableName() +
+                "  where behospitalCode='" + s.getBehospitalCode() +
+                "' and recId= '" + s.getRecId() +
+                "' and patientId='" + s.getPatientId() + "'";
         return sql;
     }
 
 
-    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("一般手术记录")||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(),"","");
+    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("一般手术记录") || 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(), "", "");
         }
         structuralDataVo.setModeId(modeId);
-        aMedAbnormalInfoFacade.saveAbnormalInfo("his入参", structuralDataVo.getRecId(),JSON.toJSONString(structuralDataVo),"","");
+        aMedAbnormalInfoFacade.saveAbnormalInfo("his入参", structuralDataVo.getRecId(), JSON.toJSONString(structuralDataVo), "", "");
         return structuralDataVo;
     }
 

+ 5 - 2
src/main/resources/mapper/HomePageMapper.xml

@@ -855,7 +855,9 @@
                 <if test="item.returnToType != null">
                     return_to_type = #{item.returnToType},
                 </if>
-
+                <if test="item.isDeleted != null">
+                    is_deleted = #{item.isDeleted},
+                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>
@@ -863,7 +865,8 @@
                     modifier = #{item.modifier},
                 </if>
             </set>
-            where home_page_id = #{item.homePageId} and hospital_id = #{item.hospitalId} and behospital_code = #{item.behospitalCode}
+            where hospital_id = #{item.hospitalId} and behospital_code = #{item.behospitalCode}
+
         </foreach>
     </update>