ss

pom.xml

@@ -226,9 +226,18 @@
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>3.1.10</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <version>1.8.0</version>
+            <scope>system</scope>
+            <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
     </dependencies>
 
+
+
+
     <!-- 私有仓库 -->
     <repositories>
         <repository>

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

@@ -11,7 +11,7 @@ import java.io.Serializable;
 /**
  * <p>
  * 
- * </p>
+ * </p> 知情同意书
  *
  * @author zhoutg
  * @since 2020-12-22

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 
+ * 谈话告知书
  * </p>
  *
  * @author zhoutg

src/main/java/com/diagbot/enums/TableNameEnum.java

@@ -42,8 +42,8 @@ public enum TableNameEnum implements KeyedNamed {
 //    DATA_MODEL(36, "自定义病程记录"),
 //    DATA_MODEL(37, "病程信息"),
 //    DATA_MODEL(52, "授权知情同意书"),
-    STR_TAKE_INFORMS(53, "str_talk_inform"),
-    STR_INFORMED_CONSENTS(54, "str_informed_consent"),
+    STR_TAKE_INFORMS(53, "str_informed_consent"),
+    STR_INFORMED_CONSENTS(54, "str_talk_inform"),
 //    DATA_MODEL(56, "日常病程录"),
     OTHER(55, "其他"),
     PACS_INTO(57, "med_pacs_result"),//检查信息

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

@@ -117,20 +117,20 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
 
     public void executeDoctorXM()  {
         try{
-            String path = this.getClass().getClassLoader().getResource("ss.xml").getPath();
-            System.out.println(path);
-            String filePath = URLDecoder.decode(path, "UTF-8");
-            System.out.println(filePath);
+//            String path = this.getClass().getClassLoader().getResource("ss.xml").getPath();
+//            System.out.println(path);
+//            String filePath = URLDecoder.decode(path, "UTF-8");
+//            System.out.println(filePath);
             String value;
+            String filePath ="/home/server/mrqc/xml/ss.xml";
             FileReader in =new FileReader(filePath);
             BufferedReader br=new BufferedReader(new FileReader(new File(filePath)));
             System.out.println(in);
             while((value=br.readLine())!=null) {
-                System.out.println(value);
+                System.out.println("文件内容--------"+value);
             }
 
 
-
             JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
             Client client = dcf.createClient("http://192.168.12.92:9090/services/HIPMessageServer?wsdl");
             //
@@ -149,7 +149,8 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
 
             System.out.println("返回数据:" + objects[0].toString());
         }catch (Exception e){
-            e.getMessage();
+            System.out.println("异常---------"+e.getMessage());
+            e.printStackTrace();
         }
 
 

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

@@ -336,6 +336,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             homePage.setBehospitalDate(DateUtil.parseDateTime(homePageVO.getBehospitalDate()));//入院日期
             homePage.setLeaveHospitalDate(DateUtil.parseDateTime(homePageVO.getLeaveHospitalDate()));//出院时间
             homePage.setBirthday(DateUtil.parseDate(homePageVO.getBirthday()));//出生日期
+            homePage.setQcDate(DateUtil.parseDateTime(homePageVO.getQcDate()));//质控日期
 
             List<HomePage> list1=new ArrayList<>();
             list1.add(homePage);

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

@@ -375,12 +375,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                         BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
                                 .eq("behospital_code", s.getBehospitalCode())
                                 .eq("hospital_id", s.getHospitalId()), false);
-                        if (behospitalInfo != null) {
-                            //如果病人住院信息存在，更新对应的qc_type_id
-                            Long qcTypeId = initQcTypeId(s);
-                            behospitalInfo.setQcTypeId(qcTypeId);
-                            behospitalInfoList.add(behospitalInfo);
-                        }
+//                        if (behospitalInfo != null) {
+//                            //如果病人住院信息存在，更新对应的qc_type_id
+//                            Long qcTypeId = initQcTypeId(s);
+//                            behospitalInfo.setQcTypeId(qcTypeId);
+//                            behospitalInfoList.add(behospitalInfo);
+//                        }
                     }
                     s.setModeId(modeId);
                     //新增或修改

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

@@ -49,7 +49,7 @@ public class AStrConsultationResultFacade extends StrConsultationResultServiceIm
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
+            String modelName = ModeIdEnum.getName(Integer.parseInt("31"));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -70,7 +70,7 @@ public class AStrConsultationResultFacade extends StrConsultationResultServiceIm
             strConsultationResult.setWholeData(JSON.toJSONString(wholeData));
 
             aMedicalRecordContentFacade.executeByView(hisViewVos.get(0));
-            aMedicalRecordFacade.executeByView(hisViewVos.get(0),modeId);
+            aMedicalRecordFacade.executeByView(hisViewVos.get(0),"31");
 
             this.dealData(strConsultationResult);
         } catch (Exception e) {

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

@@ -34,7 +34,7 @@ public class AStrInformedConsentFacade extends StrInformedConsentServiceImpl {
                         HisViewVo hisViewVo =new HisViewVo();
                         BeanUtil.copyProperties(str,hisViewVo);
                         aMedicalRecordContentFacade.executeByView(hisViewVo);
-                        aMedicalRecordFacade.executeByView(hisViewVo,"54");
+                        aMedicalRecordFacade.executeByView(hisViewVo,"53");
                     });
 
                     StrInformedConsent strInformedConsent = this.getOne(new QueryWrapper<StrInformedConsent>()
@@ -54,7 +54,7 @@ public class AStrInformedConsentFacade extends StrInformedConsentServiceImpl {
                     }
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("告知书", s.getRecId(), JSON.toJSONString(strInformedConsents), "", e.getMessage());
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("知情同意书", s.getRecId(), JSON.toJSONString(strInformedConsents), "", e.getMessage());
                 }
             });
         }

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

@@ -77,7 +77,7 @@ public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
 
             BeanUtils.copyProperties(strLeaveHospitalVO,strLeaveHospital);
             strLeaveHospital.setHospitalId(hisViewVos.get(0).getHospitalId());
-            strLeaveHospital.setWholeData(JSON.toJSONString(wholeData));
+
 
             if (strLeaveHospital.getLeaveHospitalDate()!=null && strLeaveHospital.getBehospitalDate()!=null){
                 Integer day;
@@ -112,8 +112,9 @@ public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
                     day= day2-day1;
                 }
                 strLeaveHospital.setBehospitalDayNum(String.valueOf(day));
+                wholeData.put("住院天数",String.valueOf(day));
             }
-
+            strLeaveHospital.setWholeData(JSON.toJSONString(wholeData));
             aMedicalRecordContentFacade.executeByView(hisViewVos.get(0));
             aMedicalRecordFacade.executeByView(hisViewVos.get(0),modeId);
 

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

@@ -74,10 +74,8 @@ public class AStrRescueNoteFacade extends StrRescueNoteServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strRescueNote);
             strRescueNote.setWholeData(JSON.toJSONString(wholeData));
 
-            //判断是否有文本 如果有获取它
-            if (hisViewVos.get(0).getContentText()!=null){
-                aMedicalRecordContentFacade.executeByView(hisViewVos.get(0));
-            }
+            aMedicalRecordContentFacade.executeByView(hisViewVos.get(0));
+            aMedicalRecordFacade.executeByView(hisViewVos.get(0),modeId);
 
             this.dealData(strRescueNote);
         } catch (Exception e) {

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

@@ -38,7 +38,7 @@ public class AStrTalkInformFacade extends StrTalkInformServiceImpl {
                         HisViewVo hisViewVo =new HisViewVo();
                         BeanUtil.copyProperties(str,hisViewVo);
                         aMedicalRecordContentFacade.executeByView(hisViewVo);
-                        aMedicalRecordFacade.executeByView(hisViewVo,"53");
+                        aMedicalRecordFacade.executeByView(hisViewVo,"54");
                     });
 
                     StrTalkInform strTalkInform = this.getOne(new QueryWrapper<StrTalkInform>()

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

@@ -129,54 +129,7 @@ public class StructuralDataFacade {
 
     }
 
-    /**
-     * 终末质控，根据时间来导入数据
-     * @param structuralDataVo
-     */
-    public void  sendStructuralDataOld(StructuralDataVo structuralDataVo){
-        try {
-            String sql ="select * from med_behospital_info t  where  t.behospitalDate >=to_date('"+structuralDataVo.getStartDate()
-                    + "','yyyymmdd') and t.behospitalDate <= to_date('"+structuralDataVo.getStopDate()+"','yyyymmdd')";
-            List<String> strings =fjtzdbConnHarp.getBehospitalInfoDate(sql);
-            strings.forEach(s->{
-                StructuralDataVo sData =new StructuralDataVo();
-                if (null!=structuralDataVo.getModeId()){
-                    sData.setBehospitalCode(s);
-                    sData.setModeId(structuralDataVo.getModeId());
-                    executeOld(sData);
-                }else {
-                    for (int i = 0; i < 65; i++) {
-                        String tableName = TableNameEnum.getName(i);
-                        if (null != tableName) {
-                            sData.setBehospitalCode(s);
-                            sData.setModeId(String.valueOf(i));
-                            executeOld(sData);
-                        }
-                    }
-                }
-            });
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("保存数据异常", "",JSON.toJSONString(structuralDataVo),"",e.getMessage());
-        }
-    }
 
-    /**
-     * 终末质控，单个病人来导入数据
-     * @param behospitalCode
-     */
-    public void  sendOnebehospitalCode(List<String> behospitalCode){
-            behospitalCode.forEach(s->{
-                StructuralDataVo sData =new StructuralDataVo();
-                sData.setBehospitalCode(s);
-                for (int i = 0; i <65 ; i++) {
-                    String tableName=TableNameEnum.getName(i);
-                    if (null!=tableName){
-                        sData.setModeId(String.valueOf(i));
-                        executeOld(sData);
-                    }
-                }
-            });
-    }
 
 
     /**
@@ -265,7 +218,7 @@ public class StructuralDataFacade {
             }else if("会诊申请单".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrConsultationApplyFacade.getOneList(hisViewVos,s.getModeId());
+                    aStrConsultationResultFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("会诊结果单".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
@@ -329,24 +282,22 @@ public class StructuralDataFacade {
                 if (behospitalInfo.size() > 0) {
                     aBehospitalInfoFacade.execute(behospitalInfo);
                 }
-            }
-//            else if ("检查信息".equals(modelName)){
-//                List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sql(s));
-//                if (pacsResult.size()>0){
-//                    aMedPacsResultFacade.execute(pacsResult);
-//                }
-//            }else if ("检验信息".equals(modelName)){
-//                List<MedLisResult> lisResult =fjtzdbConnHarp.getLisResult(this.sql(s));
-//                if (lisResult.size()>0){
-//                    aMedLisResultFacade.execute(lisResult);
-//                }
-//            }
-                 else if ("知情同意书".equals(modelName)){
+            }else if ("检查信息".equals(modelName)){
+                List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sql(s));
+                if (pacsResult.size()>0){
+                    aMedPacsResultFacade.execute(pacsResult);
+                }
+            }else if ("检验信息".equals(modelName)){
+                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){
                     aStrTalkInformFacade.execute(strTalkInforms);
                 }
-            }else if ("谈话告知书".equals(modelName)){
+            }else if ("知情同意书".equals(modelName)){
                 List<StrInformedConsent> strInformedConsents =fjtzdbConnHarp.getStrInformedConsent(this.sql(s));
                 if (strInformedConsents.size()>0){
                     aStrInformedConsentFacade.execute(strInformedConsents);
@@ -375,262 +326,7 @@ public class StructuralDataFacade {
 
     }
 
-    /**
-     * 终末，历史数据拉取
-     * @param s
-     */
-    public void executeOld(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.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()){
-                        aStrFirstRecordFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("输血后效果评价".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrBloodResultFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("输血/血制品病程记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrBloodTransfusionFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("转入记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrTransferInNoteFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("转出记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrTransferOutNoteFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("病危通知书".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrIllCriticallyFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("病重通知书".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrIllSeriouslFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("疑难病例讨论记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrDifficultCaseFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("死亡记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrDeathNoteFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("死亡病例讨论记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getMedDeathDiscussion(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrDeathDiscussionFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("术后首次病程及谈话记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrOperativeFirstRecord.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("术前讨论、术前小结".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrPreoperativeDiscussionFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("手术记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrOperativeNoteFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("抢救记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrRescueNoteFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("出院小结".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrLeaveHospitalFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("会诊申请单".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrConsultationApplyFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("会诊结果单".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrConsultationResultFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("会诊单".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrConsultationNoteFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if ("会诊记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrConsultationRecordFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            } else if("阶段小结".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrPeriodConclusionFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("查房记录".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrWardRecordFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if ("病案首页".equals(modelName)){
-                /**
-                 * 病案首页
-                 */
-                String sql ="select * from "+s.getTableName()+" t where  t.behospitalCode='"+s.getBehospitalCode()+"'" ;
-                List<HisHomePageVO> homePage =fjtzdbConnHarp.getHomePage(sql);
-                if (homePage.size()>0) {
-                    aHomePageFacade.getOneList(homePage);//病案首页
-                    /**
-                     * 病案首页诊断
-                     */
-                    String sql01="select * from  med_home_diagnose_info  where "+" homePageId='"+homePage.get(0).getHomePageId()+"'" ;
-                    List<HomeDiagnoseInfo> homeDiagnoseInfos =fjtzdbConnHarp.getHomeDiagnose(sql01);
-                    if (homeDiagnoseInfos.size()>0) {
-                        aHomeDiagnoseInfoFacade.execute(homeDiagnoseInfos);//病案首页诊断
-                    }
-                    /**
-                     * 病案首页手术
-                     */
-                    String sql02="select * from  med_home_operation_info  where "+" homePageId='"+homePage.get(0).getHomePageId()+"'" ;
-                    List<HomeOperationInfo> homeOperationInfos =fjtzdbConnHarp.getHomeOperation(sql02);
-                    if (homeOperationInfos.size()>0) {
-                        aHomeOperationInfoFacade.execute(homeOperationInfos);//病案首页手术
-                    }
-                }
-            }else if ("医嘱信息".equals(modelName)){
-                List<DoctorAdvice> doctorAdvice =fjtzdbConnHarp.getDoctorAdvice(this.sqlOld(s));
-                if (doctorAdvice.size()>0){
-                    aDoctorAdviceFacade.execute(doctorAdvice);
-                }
-            }else if ("入院登记".equals(modelName)) {
-                List<BehospitalInfo> behospitalInfo = fjtzdbConnHarp.getBehospitalInfo(this.sqlOld(s));
-                if (behospitalInfo.size() > 0) {
-                    aBehospitalInfoFacade.execute(behospitalInfo);
-                }
 
-//            else if ("检查信息".equals(modelName)){
-//                List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sqlOld(s));
-//                if (pacsResult.size()>0){
-//                    aMedPacsResultFacade.execute(pacsResult);
-//                }
-//            }else if ("检验信息".equals(modelName)){
-//                List<MedLisResult> lisResult =fjtzdbConnHarp.getLisResult(this.sqlOld(s));
-//                if (lisResult.size()>0){
-//                    aMedLisResultFacade.execute(lisResult);
-//                }
-//
-            } else if ("知情同意书".equals(modelName)){
-                List<StrTalkInform> strTalkInforms =fjtzdbConnHarp.getStrTalkInform(this.sqlOld(s));
-                if (strTalkInforms.size()>0){
-                    aStrTalkInformFacade.execute(strTalkInforms);
-                }
-            }else if ("谈话告知书".equals(modelName)){
-                List<StrInformedConsent> strInformedConsents =fjtzdbConnHarp.getStrInformedConsent(this.sqlOld(s));
-                if (strInformedConsents.size()>0){
-                    aStrInformedConsentFacade.execute(strInformedConsents);
-                }
-            }else if ("危急值信息".equals(modelName)){
-                List<MedCrisisInfo> medCrisisInfos =fjtzdbConnHarp.getMedCrisisInfo(this.sqlOld(s));
-                if (medCrisisInfos.size()>0){
-                    aMedCrisisFacade.execute(medCrisisInfos);
-                }
-            }else if("入院记录".equals(modelName)){
-                List<FJStrAdmissionNoteVo> medAdmissionNote =fjtzdbConnHarp.getMedAdmissionNote(this.sqlOld(s));
-                if (medAdmissionNote.size()>0){
-                    aStrAdmissionNoteFacade.getOneList(medAdmissionNote,s.getModeId());
-                }
-            }else if("危急值记录".equals(modelName)){
-                List<StrCrisisNote> medCrisisNote =fjtzdbConnHarp.getMedCrisisNote(this.sqlOld(s));
-                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());
-        }
-
-    }
 
     /**
      * 评分后返回结构体
@@ -648,11 +344,11 @@ public class StructuralDataFacade {
             Map<String, Object> map = new HashMap<String, Object>();
             map.put("url", url);
             return RespDTO.onSuc(map);
-        } else if (structuralDataVos.getDockModeType().equals("2")) {
+        }else{
             AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
             analyzeRunVO.setBehospitalCode(structuralDataVos.getBehospitalCode());
-            analyzeRunVO.setHospitalId(Long.valueOf(structuralDataVos.getHospitalId()));
-            analyzeRunVO.setModeId(Long.valueOf(structuralDataVos.getModeId()));
+            analyzeRunVO.setHospitalId(hospitalId);
+            analyzeRunVO.setModeId(modeId);
             AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
             Map<String, Object> map = new HashMap<String, Object>();
             if (analyzeRunDTO.getMsgDTOList().size() > 0) {
@@ -660,51 +356,10 @@ public class StructuralDataFacade {
             }
             //接口引擎模式
             return RespDTO.onSuc(map);
-        } else {
-            return RespDTO.onError("");
         }
     }
 
 
-    /**
-     *把得到的多个数据根据recId来分成一条数据
-     */
-    public Map<String,List<HisViewVo>> executeOldDeci(List<HisViewVo> hisViewVos){
-        Map<String,List<HisViewVo>> map =new HashMap<>();
-        hisViewVos.forEach(s->{
-            List<HisViewVo> hisViewVos1=map.get(s.getRecId());
-            if (hisViewVos1!=null){
-                hisViewVos1.add(s);
-                map.put(s.getRecId(),hisViewVos1);
-            }else {
-                List<HisViewVo> h =new ArrayList<>();
-                h.add(s);
-                map.put(s.getRecId(),h);
-            }
-        });
-        return map;
-    }
-
-    /**
-     * 住院记录
-     * @param fjStrAdmissionNoteVos
-     * @return
-     */
-    public Map<String,List<FJStrAdmissionNoteVo>> executeOldANote(List<FJStrAdmissionNoteVo> fjStrAdmissionNoteVos){
-        Map<String,List<FJStrAdmissionNoteVo>> map =new HashMap<>();
-        fjStrAdmissionNoteVos.forEach(s->{
-            List<FJStrAdmissionNoteVo> fjStrAdmissionNoteVos1=map.get(s.getRecId());
-            if (fjStrAdmissionNoteVos1!=null){
-                fjStrAdmissionNoteVos1.add(s);
-                map.put(s.getRecId(),fjStrAdmissionNoteVos1);
-            }else {
-                List<FJStrAdmissionNoteVo> h =new ArrayList<>();
-                h.add(s);
-                map.put(s.getRecId(),h);
-            }
-        });
-        return map;
-    }
     /**
      * 根据传来的信息编辑视图的sql语句
      * @param s
@@ -716,13 +371,5 @@ public class StructuralDataFacade {
         return sql;
     }
 
-    /**
-     * 历史数据拉取
-     * @param s
-     * @return
-     */
-    public String sqlOld(StructuralDataVo s){
-        String sql ="select * from "+s.getTableName()+" t where t.behospitalCode = '"+s.getBehospitalCode()+"'";
-        return sql;
-    }
+
 }

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

@@ -0,0 +1,437 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.diagbot.entity.*;
+import com.diagbot.enums.ModeIdEnum;
+import com.diagbot.enums.TableNameEnum;
+import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.util.FJTZDBConnHarp;
+import com.diagbot.util.ReadProperties;
+import com.diagbot.vo.data.FJStrAdmissionNoteVo;
+import com.diagbot.vo.data.HisHomePageVO;
+import com.diagbot.vo.data.HisViewVo;
+import com.diagbot.vo.data.StructuralDataVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class StructuralOldDataFacade {
+    @Autowired
+    private AStrAdmissionNoteFacade aStrAdmissionNoteFacade;
+    @Autowired
+    private AStrFirstRecordFacade aStrFirstRecordFacade;
+    @Autowired
+    private AStrPeriodConclusionFacade aStrPeriodConclusionFacade;
+    @Autowired
+    private AStrBloodResultFacade aStrBloodResultFacade;
+    @Autowired
+    private AStrBloodTransfusionFacade aStrBloodTransfusionFacade;
+    @Autowired
+    private AStrTransferInNoteFacade aStrTransferInNoteFacade;
+    @Autowired
+    private AStrTransferOutNoteFacade aStrTransferOutNoteFacade;
+    @Autowired
+    private AStrIllSeriouslFacade aStrIllSeriouslFacade;
+    @Autowired
+    private AStrIllCriticallyFacade aStrIllCriticallyFacade;
+    @Autowired
+    private AStrDifficultCaseFacade aStrDifficultCaseFacade;
+    @Autowired
+    private AStrDeathNoteFacade aStrDeathNoteFacade;
+    @Autowired
+    private AStrDeathDiscussionFacade aStrDeathDiscussionFacade;
+    @Autowired
+    private AStrWardRecordFacade aStrWardRecordFacade;
+    @Autowired
+    private AStrOperativeFirstRecord aStrOperativeFirstRecord;
+    @Autowired
+    private AStrPreoperativeDiscussionFacade aStrPreoperativeDiscussionFacade;
+    @Autowired
+    private AStrOperativeNoteFacade aStrOperativeNoteFacade;
+    @Autowired
+    private AStrRescueNoteFacade aStrRescueNoteFacade;
+    @Autowired
+    private AStrCrisisNoteFacade aStrCrisisNoteFacade;
+    @Autowired
+    private AStrLeaveHospitalFacade aStrLeaveHospitalFacade;
+    @Autowired
+    private AStrConsultationApplyFacade aStrConsultationApplyFacade;
+    @Autowired
+    private AStrConsultationResultFacade aStrConsultationResultFacade;
+    @Autowired
+    private AStrConsultationNoteFacade aStrConsultationNoteFacade;
+    @Autowired
+    private AStrConsultationRecordFacade aStrConsultationRecordFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Autowired
+    private ReadProperties readProperties;
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+    @Autowired
+    private AHomePageFacade aHomePageFacade;
+    @Autowired
+    private ABehospitalInfoFacade aBehospitalInfoFacade;
+    @Autowired
+    private ADoctorAdviceFacade aDoctorAdviceFacade;
+    @Autowired
+    private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
+    @Autowired
+    private AHomeOperationInfoFacade aHomeOperationInfoFacade;
+    @Autowired
+    private AMedPacsResultFacade aMedPacsResultFacade;
+    @Autowired
+    private AMedLisResultFacade aMedLisResultFacade;
+    @Autowired
+    private AStrTalkInformFacade aStrTalkInformFacade;
+    @Autowired
+    private AStrInformedConsentFacade aStrInformedConsentFacade;
+    @Autowired
+    private AMedCrisisFacade aMedCrisisFacade;
+
+    private FJTZDBConnHarp fjtzdbConnHarp = new FJTZDBConnHarp();
+
+
+    /**
+     * 终末质控，根据时间来导入数据
+     * @param structuralDataVo
+     */
+    public void  sendStructuralDataOld(StructuralDataVo structuralDataVo){
+        try {
+            String sql ="select * from med_behospital_info t  where  t.behospitalDate >=to_date('"+structuralDataVo.getStartDate()
+                    + "','yyyymmdd') and t.behospitalDate <= to_date('"+structuralDataVo.getStopDate()+"','yyyymmdd')";
+            List<String> strings =fjtzdbConnHarp.getBehospitalInfoDate(sql);
+            strings.forEach(s->{
+                StructuralDataVo sData =new StructuralDataVo();
+                if (null!=structuralDataVo.getModeId()){
+                    sData.setBehospitalCode(s);
+                    sData.setModeId(structuralDataVo.getModeId());
+                    executeOld(sData);
+                }else {
+                    for (int i = 0; i < 65; i++) {
+                        String tableName = TableNameEnum.getName(i);
+                        if (null != tableName) {
+                            sData.setBehospitalCode(s);
+                            sData.setModeId(String.valueOf(i));
+                            executeOld(sData);
+                        }
+                    }
+                }
+            });
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("保存数据异常", "",JSON.toJSONString(structuralDataVo),"",e.getMessage());
+        }
+    }
+
+    /**
+     * 终末质控，单个病人来导入数据
+     * @param behospitalCode
+     */
+    public void  sendOnebehospitalCode(List<String> behospitalCode){
+        behospitalCode.forEach(s->{
+            StructuralDataVo sData =new StructuralDataVo();
+            sData.setBehospitalCode(s);
+            for (int i = 0; i <65 ; i++) {
+                String tableName=TableNameEnum.getName(i);
+                if (null!=tableName){
+                    sData.setModeId(String.valueOf(i));
+                    executeOld(sData);
+                }
+            }
+        });
+    }
+
+
+
+    /**
+     * 终末，历史数据拉取
+     * @param s
+     */
+    public void executeOld(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.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()){
+                        aStrFirstRecordFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("输血后效果评价".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrBloodResultFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("输血/血制品病程记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrBloodTransfusionFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("转入记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrTransferInNoteFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("转出记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrTransferOutNoteFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("病危通知书".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrIllCriticallyFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("病重通知书".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrIllSeriouslFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("疑难病例讨论记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrDifficultCaseFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("死亡记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrDeathNoteFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("死亡病例讨论记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getMedDeathDiscussion(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrDeathDiscussionFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("术后首次病程及谈话记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrOperativeFirstRecord.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("术前讨论、术前小结".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrPreoperativeDiscussionFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("手术记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrOperativeNoteFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("抢救记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrRescueNoteFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("出院小结".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrLeaveHospitalFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("会诊申请单".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrConsultationApplyFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("会诊结果单".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrConsultationResultFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("会诊单".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrConsultationNoteFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if ("会诊记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrConsultationRecordFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            } else if("阶段小结".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrPeriodConclusionFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if("查房记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
+                if (hisViewVos.size()>0){
+                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
+                    for (String key:map.keySet()) {
+                        aStrWardRecordFacade.getOneList(map.get(key),s.getModeId());
+                    }
+                }
+            }else if ("病案首页".equals(modelName)){
+                /**
+                 * 病案首页
+                 */
+                String sql ="select * from "+s.getTableName()+" t where  t.behospitalCode='"+s.getBehospitalCode()+"'" ;
+                List<HisHomePageVO> homePage =fjtzdbConnHarp.getHomePage(sql);
+                if (homePage.size()>0) {
+                    aHomePageFacade.getOneList(homePage);//病案首页
+                    /**
+                     * 病案首页诊断
+                     */
+                    String sql01="select * from  med_home_diagnose_info  where "+" homePageId='"+homePage.get(0).getHomePageId()+"'" ;
+                    List<HomeDiagnoseInfo> homeDiagnoseInfos =fjtzdbConnHarp.getHomeDiagnose(sql01);
+                    if (homeDiagnoseInfos.size()>0) {
+                        aHomeDiagnoseInfoFacade.execute(homeDiagnoseInfos);//病案首页诊断
+                    }
+                    /**
+                     * 病案首页手术
+                     */
+                    String sql02="select * from  med_home_operation_info  where "+" homePageId='"+homePage.get(0).getHomePageId()+"'" ;
+                    List<HomeOperationInfo> homeOperationInfos =fjtzdbConnHarp.getHomeOperation(sql02);
+                    if (homeOperationInfos.size()>0) {
+                        aHomeOperationInfoFacade.execute(homeOperationInfos);//病案首页手术
+                    }
+                }
+            }else if ("医嘱信息".equals(modelName)){
+                List<DoctorAdvice> doctorAdvice =fjtzdbConnHarp.getDoctorAdvice(this.sqlOld(s));
+                if (doctorAdvice.size()>0){
+                    aDoctorAdviceFacade.execute(doctorAdvice);
+                }
+            }else if ("入院登记".equals(modelName)) {
+                List<BehospitalInfo> behospitalInfo = fjtzdbConnHarp.getBehospitalInfo(this.sqlOld(s));
+                if (behospitalInfo.size() > 0) {
+                    aBehospitalInfoFacade.execute(behospitalInfo);
+                }
+            }else if ("检查信息".equals(modelName)){
+                List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sqlOld(s));
+                if (pacsResult.size()>0){
+                    aMedPacsResultFacade.execute(pacsResult);
+                }
+            }else if ("检验信息".equals(modelName)){
+                List<MedLisResult> lisResult =fjtzdbConnHarp.getLisResult(this.sqlOld(s));
+                if (lisResult.size()>0){
+                    aMedLisResultFacade.execute(lisResult);
+                }
+            } else if ("知情同意书".equals(modelName)){
+                List<StrTalkInform> strTalkInforms =fjtzdbConnHarp.getStrTalkInform(this.sqlOld(s));
+                if (strTalkInforms.size()>0){
+                    aStrTalkInformFacade.execute(strTalkInforms);
+                }
+            }else if ("谈话告知书".equals(modelName)){
+                List<StrInformedConsent> strInformedConsents =fjtzdbConnHarp.getStrInformedConsent(this.sqlOld(s));
+                if (strInformedConsents.size()>0){
+                    aStrInformedConsentFacade.execute(strInformedConsents);
+                }
+            }else if ("危急值信息".equals(modelName)){
+                List<MedCrisisInfo> medCrisisInfos =fjtzdbConnHarp.getMedCrisisInfo(this.sqlOld(s));
+                if (medCrisisInfos.size()>0){
+                    aMedCrisisFacade.execute(medCrisisInfos);
+                }
+            }else if("入院记录".equals(modelName)){
+                List<FJStrAdmissionNoteVo> medAdmissionNote =fjtzdbConnHarp.getMedAdmissionNote(this.sqlOld(s));
+                if (medAdmissionNote.size()>0){
+                    aStrAdmissionNoteFacade.getOneList(medAdmissionNote,s.getModeId());
+                }
+            }else if("危急值记录".equals(modelName)){
+                List<StrCrisisNote> medCrisisNote =fjtzdbConnHarp.getMedCrisisNote(this.sqlOld(s));
+                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());
+        }
+
+    }
+
+
+    /**
+     *把得到的多个数据根据recId来分成一条数据
+     */
+    public Map<String,List<HisViewVo>> executeOldDeci(List<HisViewVo> hisViewVos){
+        Map<String,List<HisViewVo>> map =new HashMap<>();
+        hisViewVos.forEach(s->{
+            List<HisViewVo> hisViewVos1=map.get(s.getRecId());
+            if (hisViewVos1!=null){
+                hisViewVos1.add(s);
+                map.put(s.getRecId(),hisViewVos1);
+            }else {
+                List<HisViewVo> h =new ArrayList<>();
+                h.add(s);
+                map.put(s.getRecId(),h);
+            }
+        });
+        return map;
+    }
+
+    /**
+     * 历史数据拉取
+     * @param s
+     * @return
+     */
+    public String sqlOld(StructuralDataVo s){
+        String sql ="select * from "+s.getTableName()+" t where t.behospitalCode = '"+s.getBehospitalCode()+"'";
+        return sql;
+    }
+}

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

@@ -7,10 +7,7 @@ import com.diagbot.vo.data.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -50,6 +47,8 @@ public class DataController {
     private StructuralDataFacade structuralDataFacade;
     @Autowired
     private DeleteFlagFacade deleteFlagFacade;
+    @Autowired
+    private StructuralOldDataFacade sendOnebehospitalCode;
 //
 //    @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
 //    @PostMapping("/sendDoctorInfos")
@@ -58,7 +57,7 @@ public class DataController {
 //        return aBasDoctorInfoFacade.executeDoctor(list);
 //    }
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
-    @PostMapping("/sendDoctorInfos")
+    @GetMapping("/sendDoctorInfos")
     @SysLogger("sendDoctorInfos")
     public void sendDoctorInfos(){
         aBasDoctorInfoFacade.executeDoctorXM();
@@ -95,13 +94,13 @@ public class DataController {
     @PostMapping("/sendStructuralOneOld")
     @SysLogger("sendStructuralOneOld")
     public void sendStructuralOneOld(@Valid @RequestBody List<String> behospitalCode){
-         structuralDataFacade.sendOnebehospitalCode(behospitalCode);
+        sendOnebehospitalCode.sendOnebehospitalCode(behospitalCode);
     }
     @ApiOperation(value = "{历史病例导入时间格式}")
     @PostMapping("/sendStructuralDateOld")
     @SysLogger("sendStructuralDateOld")
     public void sendStructuralDateOld(@Valid @RequestBody StructuralDataVo structuralDataVos){
-        structuralDataFacade.sendStructuralDataOld(structuralDataVos);
+        sendOnebehospitalCode.sendStructuralDataOld(structuralDataVos);
     }
 
     @ApiOperation(value = "终末质控-文书信息")