修改邵逸夫质控代码

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

@@ -27,6 +27,7 @@ import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedicalRecordVO;
 import com.diagbot.vo.data.AMrContentVO;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -37,6 +38,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Component
 public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
@@ -88,233 +90,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
     private TZDBConn tzDBConn = new TZDBConn();
 
-    public void selectDataAndSave() {
-        QueryWrapper<MedicalRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mode_id", 6);
-        List<MedicalRecord> medicalRecordList = medicalRecordService.list(queryWrapper);
-        if (medicalRecordList.size() > 0) {
-            medicalRecordList.stream().forEach(s -> {
-
-                try {
-                    MedicalRecordContent medicalRecordContent = medicalRecordContentServiceImpl.getOne(new QueryWrapper<MedicalRecordContent>().eq("rec_id", s.getRecId()));
-
-                    ShaoyfHtmlUtil shaoyfHtmlUtil = new ShaoyfHtmlUtil();
-                    Map<String, Object> ret = shaoyfHtmlUtil.getPageMap(medicalRecordContent.getHtmlText());
-                    JSONObject paramsObj = new JSONObject(ret);
-                    JSONObject homePageObject = paramsObj.getJSONObject("病案首页");
-
-                    HomePage homePage = new HomePage();
-                    homePage.setHomePageId(s.getRecId());
-                    homePage.setHospitalId(Long.parseLong("2"));
-                    homePage.setBehospitalCode(s.getBehospitalCode());
-                    //homePage.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
-                    homePage.setHospitalCode("A001");
-                    homePage.setHospitalName("邵逸夫");
-                    homePage.setOrgCode("A001");
-                    homePage.setPayType(homePageObject.getString("医疗付费方式"));
-                    homePage.setHealthCard(homePageObject.getString("健康卡号"));
-                    homePage.setBehospitalNum(homePageObject.getString("住院次数"));
-                    homePage.setFileCode(homePageObject.getString("病历号"));
-                    homePage.setName(homePageObject.getString("本人姓名"));
-                    homePage.setSex(homePageObject.getString("性别"));
-                    homePage.setBirthday(ShaoyfDateUtil.parseDateTime(homePageObject.getString("生日")));
-                    homePage.setAge(homePageObject.getString("年龄"));
-                    homePage.setAgeUnit(homePageObject.getString("年龄单位"));
-                    homePage.setNationality(homePageObject.getString("国籍"));
-                    homePage.setNewbornDay(homePageObject.getString("新生儿年龄日"));
-                    homePage.setNewbornMonth(homePageObject.getString("新生儿年龄月"));
-                    homePage.setNewbornWeight(homePageObject.getString("出生体重1"));
-                    homePage.setNewbornBehospitalWeight(homePageObject.getString("新生儿入院体重"));
-                    homePage.setBornAddress(homePageObject.getString("出生地址"));
-                    homePage.setBornPlace(homePageObject.getString("籍贯"));
-                    homePage.setNation(homePageObject.getString("民族"));
-                    homePage.setIdentityCardNo(homePageObject.getString("居民身份证"));
-                    homePage.setJobType(homePageObject.getString("退休人员"));
-                    homePage.setMarriage(homePageObject.getString("婚姻"));
-                    homePage.setCurAddress(homePageObject.getString("现住址"));
-                    homePage.setCurPhone(homePageObject.getString("家庭电话"));
-                    homePage.setCurPostCode(homePageObject.getString("居住地邮政编码"));
-                    homePage.setResidenceAddress(homePageObject.getString("户籍住址"));
-                    homePage.setResidencePostCode(homePageObject.getString("户口地址邮政编码"));
-                    homePage.setWorkAddress(homePageObject.getString("工作场所"));
-                    homePage.setWorkPhone(homePageObject.getString("本人工作单位电话"));
-                    homePage.setWorkPostCode(homePageObject.getString("工作单位邮政编码"));
-                    homePage.setContactName(homePageObject.getString("联系人姓名"));
-                    homePage.setContactRelation(homePageObject.getString("联系人关系"));
-                    homePage.setContactAddress(homePageObject.getString("联系人地址"));
-                    homePage.setContactPhone(homePageObject.getString("联系电话"));
-                    homePage.setBehospitalWay(homePageObject.getString("入院途径"));
-                    homePage.setBehospitalDept(homePageObject.getString("入院科室"));
-                    homePage.setBehospitalWard(homePageObject.getString("病房(入)"));
-                    //homePage.setBehospitalBedCode(homePageResponse.getData().getBedid_in());
-                    homePage.setChangeDept(homePageObject.getString("转科科室"));
-                    homePage.setJobType(homePageObject.getString("职业"));
-                    homePage.setLeaveHospitalDate(ShaoyfDateUtil.parseDateTime(homePageObject.getString("出院日期")));
-                    homePage.setBehospitalDate(ShaoyfDateUtil.parseDateTime(homePageObject.getString("入院日期")));
-                    homePage.setIsPhysicalRestraint(homePageObject.getString("住院期间身体约束"));
-                    homePage.setTbiBehospitalBeforeTime(homePageObject.getString("颅脑损伤患者昏迷时间(入院前)"));
-                    homePage.setTbiBehospitalAfterTime(homePageObject.getString("颅脑损伤患者昏迷时间(入院后)"));
-                    homePage.setIsFallBed(homePageObject.getString("住院期间是否发生跌倒或坠床"));
-                    homePage.setIsNosocomialInfection(homePageObject.getString("医院感染"));
-                    homePage.setIsIntoIcu(homePageObject.getString("入住ICU情况"));
-                    homePage.setIsComplications(homePageObject.getString("并发症情况"));
-                    homePage.setIsPressureSore(homePageObject.getString("是否发生压疮"));
-                    homePage.setIsBehospitalPressureSore(homePageObject.getString("是否住院期间发生压疮"));
-                    homePage.setTreatmentResults(homePageObject.getString("治疗结果"));
-                    homePage.setComplicationsResults(homePageObject.getString("并发症"));
-                    homePage.setInfectionSite(homePageObject.getString("感染部位"));
-                    homePage.setIsBeInDanger(homePageObject.getString("住院期间有无告病危"));
-                    homePage.setIsUnplannedReoperation(homePageObject.getString("非计划再次手术"));
-                    homePage.setOtherTypeFee(homePageObject.getString("综合医疗其他服务费"));
-                    homePage.setTotalFee(homePageObject.getString("住院费用"));
-                    homePage.setIsOperationBeforeAfter(homePageObject.getString("术前诊断与术后诊断"));
-                    homePage.setIsLeaveBehospital(homePageObject.getString("入院诊断与出院诊断"));
-                    homePage.setIsClinicPathology(homePageObject.getString("临床诊断与病理诊断"));
-                    homePage.setIsOutpatientBehospital(homePageObject.getString("门诊诊断与住院诊断"));
-                    homePage.setIsRadiatePathology(homePageObject.getString("放射诊断与病理诊断"));
-                    homePage.setMedAllergyName(homePageObject.getString("过敏史"));
-                    homePage.setAcceptOrgCode(homePageObject.getString("拟接收医疗机构名称"));
-                    homePage.setAgainBehospitalGoal(homePageObject.getString("目的"));
-                    homePage.setContactPhone(homePageObject.getString("联系电话"));
-                    homePage.setRescueSuccessNum(homePageObject.getString("成功次数"));
-                    homePage.setLeaveHospitalDept(homePageObject.getString("出院科室"));
-                    homePage.setLeaveHospitalWard(homePageObject.getString("病房(出)"));
-                    homePage.setBehospitalDayNum(homePageObject.getString("实际住院天数"));
-                    homePage.setOutpatientEmrDiagnose(homePageObject.getString("门急诊诊断"));
-                    homePage.setOutpatientEmrDiagnoseCode(homePageObject.getString("门急诊诊断编码"));
-                    homePage.setPoisonFactor(homePageObject.getString("损伤中毒因素"));
-                    homePage.setPoisonFactorCode(homePageObject.getString("损伤中毒因素编码"));
-                    homePage.setPathologyDiagnose(homePageObject.getString("病理诊断"));
-                    homePage.setPathologyDiagnoseId(homePageObject.getString("病理诊断编号"));
-                    //homePage.setMedAllergyName(homePageResponse.getData().getDrug_allergy());
-                    homePage.setAutopsy(homePageObject.getString("尸检"));
-                    homePage.setBloodType(homePageObject.getString("血型"));
-                    homePage.setRh(homePageObject.getString("Rh血型"));
-                    homePage.setDeptDirector(homePageObject.getString("科主任"));
-                    homePage.setDirectorDoctor(homePageObject.getString("主任医生"));
-                    homePage.setAttendingDoctor(homePageObject.getString("主治医生"));
-                    homePage.setBehospitalDoctor(homePageObject.getString("住院医生"));
-                    homePage.setResponseNurse(homePageObject.getString("住院医生"));
-                    homePage.setStudyDoctor(homePageObject.getString("进修医生"));
-                    homePage.setPracticeDoctor(homePageObject.getString("实习医生"));
-                    homePage.setEncodeMan(homePageObject.getString("编码员"));
-                    homePage.setHomePageQuality(homePageObject.getString("病案质量"));
-                    homePage.setQcDoctor(homePageObject.getString("质控医生"));
-                    homePage.setQcNurse(homePageObject.getString("质控护士"));
-                    homePage.setQcDate(ShaoyfDateUtil.parseDateTime(homePageObject.getString("质控日期")));
-                    homePage.setLeaveHospitalType(homePageObject.getString("离院方式"));
-                    //homePage.setAcceptOrgCode(homePageResponse.getData().getAcceptOrgCode());
-                    homePage.setAgainBehospitalPlan(homePageObject.getString("出院31天再入院计划"));
-                    //homePage.setAgainBehospitalGoal(homePageResponse.getData().getAgainBehospitalGoal());
-                    //homePage.setTbiBeforeDay(homePageResponse.getData().getBraininjurybefore_day());
-                    //homePage.setTbiBeforeHour(homePageResponse.getData().getBraininjurybefore_hour());
-                    //homePage.setTbiBeforeMinute(homePageResponse.getData().getBraininjurybefore_minute());
-                    //homePage.setTbiAfterDay(homePageResponse.getData().getBraininjuryafter_day());
-                    //homePage.setTbiAfterHour(homePageResponse.getData().getBraininjuryafter_hour());
-                    //homePage.setTbiAfterMinute(homePageResponse.getData().getBraininjuryafter_minute());
-                    //homePage.setTotalFee(homePageResponse.getData().getTotalcost());
-                    homePage.setOwnFee(homePageObject.getString("住院自付金额"));
-                    homePage.setGeneralFee(homePageObject.getString("一般医疗服务费"));
-                    homePage.setServiceFee(homePageObject.getString("一般治疗操作费"));
-                    homePage.setNurseFee(homePageObject.getString("护理费"));
-                    homePage.setOtherFee(homePageObject.getString("其他费"));
-                    homePage.setPathologyFee(homePageObject.getString("病理诊断费"));
-                    homePage.setLabFee(homePageObject.getString("实验室诊断费"));
-                    homePage.setPacsFee(homePageObject.getString("影像学诊断费"));
-                    homePage.setClinicDiagnoseFee(homePageObject.getString("临床诊断项目费"));
-                    homePage.setNotOperationFee(homePageObject.getString("非手术治疗项目费"));
-                    homePage.setClinicPhysicFee(homePageObject.getString("临床物理治疗费"));
-                    homePage.setOperationTreatFee(homePageObject.getString("手术治疗费"));
-                    homePage.setAnaesthesiaFee(homePageObject.getString("麻醉费"));
-                    homePage.setOperationFee(homePageObject.getString("手术费"));
-                    homePage.setHealthTypeFee(homePageObject.getString("康复费"));
-                    homePage.setChnTreatFee(homePageObject.getString("中医治疗费"));
-                    homePage.setWesternMedFee(homePageObject.getString("西药费"));
-                    homePage.setAntibiosisFee(homePageObject.getString("抗菌药物费用"));
-                    homePage.setChnMedFee(homePageObject.getString("中成药费"));
-                    homePage.setChnHerbFee(homePageObject.getString("中草药费"));
-                    homePage.setBloodFee(homePageObject.getString("血费"));
-                    homePage.setAlbumenFee(homePageObject.getString("白蛋白类制品费"));
-                    homePage.setGlobulinFee(homePageObject.getString("球蛋白类制品费"));
-                    homePage.setBloodFactorFee(homePageObject.getString("凝血因子类制品费"));
-                    homePage.setCellFactorFee(homePageObject.getString("细胞因子类制品费"));
-                    homePage.setCheckMaterialFee(homePageObject.getString("检查用一次性医用材料费"));
-                    homePage.setTreatMaterialFee(homePageObject.getString("治疗用一次性医用材料费"));
-                    homePage.setOperationMaterialFee(homePageObject.getString("手术用一次性医用材料费"));
-                    //homePage.setOtherTypeFee(homePageResponse.getData().getOthercost());
-                    homePage.setSingleDiagManage(homePageObject.getString("单病种管理"));
-                    homePage.setClinicPathwayManage(homePageObject.getString("临床路径管理"));
-                    //homePage.setIsOutpatientBehospital(homePageResponse.getData().getIsOutpatientBehospital());
-                    //homePage.setIsLeaveBehospital(homePageResponse.getData().getIsLeaveBehospital());
-                    //homePage.setIsOperationBeforeAfter(homePageResponse.getData().getIsOperationBeforeAfter());
-                    //homePage.setIsClinicPathology(homePageResponse.getData().getIsClinicPathology());
-                    //homePage.setIsRadiatePathology(homePageResponse.getData().getIsRadiatePathology());
-                    homePage.setRescueNum(homePageObject.getString("抢救次数"));
-                    //homePage.setRescueSuccessNum(homePageResponse.getData().getRescueSuccessNum());
-                    //homePage.setIsAutoLeavehospital(homePageResponse.getData().getIsAutoLeavehospital());
-                    homePage.setReturnToType(homePageObject.getString("治疗结果"));
-                    homePage.setPathologyDiagnoseCode(homePageObject.getString("病理诊断编码"));
-
-                    //JSONObject homePageDiagObject = paramsObj.getJSONObject("诊断信息");
-                    List<Object> list = paramsObj.getJSONArray("诊断信息");
-                    List<HomeDiagnoseInfo> homeDiagnoseInfoList = Lists.newLinkedList();
-                    for (int i = 0; i < list.size(); i++) {
-                        HomeDiagnoseInfo homeDiagnoseInfo = new HomeDiagnoseInfo();
-                        homeDiagnoseInfo.setHomePageId(s.getRecId());
-                        /*homeDiagnoseInfo.setHomePageId(patientListResponse.getData().get(i).getRDN());*/
-                        homeDiagnoseInfo.setHospitalId(Long.parseLong("2"));
-                        //homeDiagnoseInfo.setDiagnoseOrderNo(homePageDiagnoseResponse.getData().get(j).getRdn());
-                        //homeDiagnoseInfo.setDiagnoseType(homePageDiagnoseResponse.getData().get(j).getPrimaryflag());
-                        //homeDiagnoseInfo.setDiagnoseTypeShort(homePageDiagnoseResponse.getData().get(j).getPrimaryflag());
-                        homeDiagnoseInfo.setDiagnoseName(((JSONArray) list).getJSONObject(i).getString("诊断名称"));
-                        homeDiagnoseInfo.setBehospitalType(((JSONArray) list).getJSONObject(i).getString("入院情况"));
-                        homeDiagnoseInfo.setIcdCode(((JSONArray) list).getJSONObject(i).getString("诊断编码"));
-                        if (i == 0) {
-                            homeDiagnoseInfo.setDiagnoseType("主要诊断");
-                        } else {
-                            homeDiagnoseInfo.setDiagnoseType("其他诊断");
-                        }
-                        homeDiagnoseInfoList.add(homeDiagnoseInfo);
-
-                    }
-
-                    List<Object> list1 = paramsObj.getJSONArray("手术信息");
-                    List<HomeOperationInfo> homeOperationInfoList = Lists.newLinkedList();
-                    for (int i = 0; i < list1.size(); i++) {
-                        HomeOperationInfo homeOperationInfo = new HomeOperationInfo();
-                        homeOperationInfo.setHomePageId(s.getRecId());
-                        /*homeOperationInfo.setHomePageId(patientListResponse.getData().get(i).getRDN());*/
-                        homeOperationInfo.setHospitalId(Long.parseLong("2"));
-                        homeOperationInfo.setOperationDate(ShaoyfDateUtil.parseDateTime(((JSONArray) list1).getJSONObject(i).getString("手术日期2")));
-                        homeOperationInfo.setOperationCode(((JSONArray) list1).getJSONObject(i).getString("手术操作代码"));
-                        homeOperationInfo.setOperationName(((JSONArray) list1).getJSONObject(i).getString("手术名称"));
-                        homeOperationInfo.setOperationDoctorId(((JSONArray) list1).getJSONObject(i).getString("手术医师"));
-                        homeOperationInfo.setFirstAssistantId(((JSONArray) list1).getJSONObject(i).getString("助手"));
-                        homeOperationInfo.setSecondAssistantId(((JSONArray) list1).getJSONObject(i).getString("助手II"));
-                        homeOperationInfo.setHealingLevel(((JSONArray) list1).getJSONObject(i).getString("切口愈合等级"));
-                        homeOperationInfo.setOperationLevel(((JSONArray) list1).getJSONObject(i).getString("手术级别"));
-                        homeOperationInfo.setCutLevel(((JSONArray) list1).getJSONObject(i).getString("切口等级"));
-                        homeOperationInfo.setAnaesthesiaName(((JSONArray) list1).getJSONObject(i).getString("麻醉方式"));
-
-                        homeOperationInfoList.add(homeOperationInfo);
-                    }
-
-
-                    homePageServiceImpl.save(homePage);
-                    homeDiagnoseInfoService.saveBatch(homeDiagnoseInfoList);
-                    homeOperationInfoService.saveBatch(homeOperationInfoList);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            });
-
-
-        }
-
-
-    }
-
     /**
      * 终末质控-同步前一天的病历记录
      */
@@ -369,7 +144,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     medicalRecordContent.setHtmlText(syfMedicalRecordList.get(j).getBLNR());
                     medicalRecordContent.setXmlText(syfMedicalRecordList.get(j).getXMLWD());
                     medicalRecordContentList.add(medicalRecordContent);
-
+                    try {
+                        //解析html获取病案首页、首页诊断、首页手术插入数据库
+                        selectDataAndSave(medicalRecordContent, medicalRecord);
+                    } catch (Exception e) {
+                        log.error(e.getMessage());
+                    }
                 }
 
                 execute(medicalRecordList);
@@ -381,6 +161,215 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
     }
 
+    public void selectDataAndSave(MedicalRecordContent medicalRecordContent, MedicalRecord medicalRecord) {
+
+        ShaoyfHtmlUtil shaoyfHtmlUtil = new ShaoyfHtmlUtil();
+        Map<String, Object> ret = shaoyfHtmlUtil.getPageMap(medicalRecordContent.getHtmlText());
+        JSONObject paramsObj = new JSONObject(ret);
+        JSONObject homePageObject = paramsObj.getJSONObject("病案首页");
+
+        HomePage homePage = new HomePage();
+        homePage.setHomePageId(medicalRecordContent.getRecId());
+        homePage.setHospitalId(Long.parseLong("2"));
+        homePage.setBehospitalCode(medicalRecord.getBehospitalCode());
+        //homePage.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
+        homePage.setHospitalCode("A001");
+        homePage.setHospitalName("邵逸夫");
+        homePage.setOrgCode("A001");
+        homePage.setPayType(homePageObject.getString("医疗付费方式"));
+        homePage.setHealthCard(homePageObject.getString("健康卡号"));
+        homePage.setBehospitalNum(homePageObject.getString("住院次数"));
+        homePage.setFileCode(homePageObject.getString("病历号"));
+        homePage.setName(homePageObject.getString("本人姓名"));
+        homePage.setSex(homePageObject.getString("性别"));
+        homePage.setBirthday(ShaoyfDateUtil.parseDateTime(homePageObject.getString("生日")));
+        homePage.setAge(homePageObject.getString("年龄"));
+        homePage.setAgeUnit(homePageObject.getString("年龄单位"));
+        homePage.setNationality(homePageObject.getString("国籍"));
+        homePage.setNewbornDay(homePageObject.getString("新生儿年龄日"));
+        homePage.setNewbornMonth(homePageObject.getString("新生儿年龄月"));
+        homePage.setNewbornWeight(homePageObject.getString("出生体重1"));
+        homePage.setNewbornBehospitalWeight(homePageObject.getString("新生儿入院体重"));
+        homePage.setBornAddress(homePageObject.getString("出生地址"));
+        homePage.setBornPlace(homePageObject.getString("籍贯"));
+        homePage.setNation(homePageObject.getString("民族"));
+        homePage.setIdentityCardNo(homePageObject.getString("居民身份证"));
+        homePage.setJobType(homePageObject.getString("退休人员"));
+        homePage.setMarriage(homePageObject.getString("婚姻"));
+        homePage.setCurAddress(homePageObject.getString("现住址"));
+        homePage.setCurPhone(homePageObject.getString("家庭电话"));
+        homePage.setCurPostCode(homePageObject.getString("居住地邮政编码"));
+        homePage.setResidenceAddress(homePageObject.getString("户籍住址"));
+        homePage.setResidencePostCode(homePageObject.getString("户口地址邮政编码"));
+        homePage.setWorkAddress(homePageObject.getString("工作场所"));
+        homePage.setWorkPhone(homePageObject.getString("本人工作单位电话"));
+        homePage.setWorkPostCode(homePageObject.getString("工作单位邮政编码"));
+        homePage.setContactName(homePageObject.getString("联系人姓名"));
+        homePage.setContactRelation(homePageObject.getString("联系人关系"));
+        homePage.setContactAddress(homePageObject.getString("联系人地址"));
+        homePage.setContactPhone(homePageObject.getString("联系电话"));
+        homePage.setBehospitalWay(homePageObject.getString("入院途径"));
+        homePage.setBehospitalDept(homePageObject.getString("入院科室"));
+        homePage.setBehospitalWard(homePageObject.getString("病房(入)"));
+        //homePage.setBehospitalBedCode(homePageResponse.getData().getBedid_in());
+        homePage.setChangeDept(homePageObject.getString("转科科室"));
+        homePage.setJobType(homePageObject.getString("职业"));
+        homePage.setLeaveHospitalDate(ShaoyfDateUtil.parseDateTime(homePageObject.getString("出院日期")));
+        homePage.setBehospitalDate(ShaoyfDateUtil.parseDateTime(homePageObject.getString("入院日期")));
+        homePage.setIsPhysicalRestraint(homePageObject.getString("住院期间身体约束"));
+        homePage.setTbiBehospitalBeforeTime(homePageObject.getString("颅脑损伤患者昏迷时间(入院前)"));
+        homePage.setTbiBehospitalAfterTime(homePageObject.getString("颅脑损伤患者昏迷时间(入院后)"));
+        homePage.setIsFallBed(homePageObject.getString("住院期间是否发生跌倒或坠床"));
+        homePage.setIsNosocomialInfection(homePageObject.getString("医院感染"));
+        homePage.setIsIntoIcu(homePageObject.getString("入住ICU情况"));
+        homePage.setIsComplications(homePageObject.getString("并发症情况"));
+        homePage.setIsPressureSore(homePageObject.getString("是否发生压疮"));
+        homePage.setIsBehospitalPressureSore(homePageObject.getString("是否住院期间发生压疮"));
+        homePage.setTreatmentResults(homePageObject.getString("治疗结果"));
+        homePage.setComplicationsResults(homePageObject.getString("并发症"));
+        homePage.setInfectionSite(homePageObject.getString("感染部位"));
+        homePage.setIsBeInDanger(homePageObject.getString("住院期间有无告病危"));
+        homePage.setIsUnplannedReoperation(homePageObject.getString("非计划再次手术"));
+        homePage.setOtherTypeFee(homePageObject.getString("综合医疗其他服务费"));
+        homePage.setTotalFee(homePageObject.getString("住院费用"));
+        homePage.setIsOperationBeforeAfter(homePageObject.getString("术前诊断与术后诊断"));
+        homePage.setIsLeaveBehospital(homePageObject.getString("入院诊断与出院诊断"));
+        homePage.setIsClinicPathology(homePageObject.getString("临床诊断与病理诊断"));
+        homePage.setIsOutpatientBehospital(homePageObject.getString("门诊诊断与住院诊断"));
+        homePage.setIsRadiatePathology(homePageObject.getString("放射诊断与病理诊断"));
+        homePage.setMedAllergyName(homePageObject.getString("过敏史"));
+        homePage.setAcceptOrgCode(homePageObject.getString("拟接收医疗机构名称"));
+        homePage.setAgainBehospitalGoal(homePageObject.getString("目的"));
+        homePage.setContactPhone(homePageObject.getString("联系电话"));
+        homePage.setRescueSuccessNum(homePageObject.getString("成功次数"));
+        homePage.setLeaveHospitalDept(homePageObject.getString("出院科室"));
+        homePage.setLeaveHospitalWard(homePageObject.getString("病房(出)"));
+        homePage.setBehospitalDayNum(homePageObject.getString("实际住院天数"));
+        homePage.setOutpatientEmrDiagnose(homePageObject.getString("门急诊诊断"));
+        homePage.setOutpatientEmrDiagnoseCode(homePageObject.getString("门急诊诊断编码"));
+        homePage.setPoisonFactor(homePageObject.getString("损伤中毒因素"));
+        homePage.setPoisonFactorCode(homePageObject.getString("损伤中毒因素编码"));
+        homePage.setPathologyDiagnose(homePageObject.getString("病理诊断"));
+        homePage.setPathologyDiagnoseId(homePageObject.getString("病理诊断编号"));
+        //homePage.setMedAllergyName(homePageResponse.getData().getDrug_allergy());
+        homePage.setAutopsy(homePageObject.getString("尸检"));
+        homePage.setBloodType(homePageObject.getString("血型"));
+        homePage.setRh(homePageObject.getString("Rh血型"));
+        homePage.setDeptDirector(homePageObject.getString("科主任"));
+        homePage.setDirectorDoctor(homePageObject.getString("主任医生"));
+        homePage.setAttendingDoctor(homePageObject.getString("主治医生"));
+        homePage.setBehospitalDoctor(homePageObject.getString("住院医生"));
+        homePage.setResponseNurse(homePageObject.getString("责任护士"));
+        homePage.setStudyDoctor(homePageObject.getString("进修医生"));
+        homePage.setPracticeDoctor(homePageObject.getString("实习医生"));
+        homePage.setEncodeMan(homePageObject.getString("编码员"));
+        homePage.setHomePageQuality(homePageObject.getString("病案质量"));
+        homePage.setQcDoctor(homePageObject.getString("质控医生"));
+        homePage.setQcNurse(homePageObject.getString("质控护士"));
+        homePage.setQcDate(ShaoyfDateUtil.parseDateTime(homePageObject.getString("质控日期")));
+        homePage.setLeaveHospitalType(homePageObject.getString("离院方式"));
+        //homePage.setAcceptOrgCode(homePageResponse.getData().getAcceptOrgCode());
+        homePage.setAgainBehospitalPlan(homePageObject.getString("出院31天再入院计划"));
+        //homePage.setAgainBehospitalGoal(homePageResponse.getData().getAgainBehospitalGoal());
+        //homePage.setTbiBeforeDay(homePageResponse.getData().getBraininjurybefore_day());
+        //homePage.setTbiBeforeHour(homePageResponse.getData().getBraininjurybefore_hour());
+        //homePage.setTbiBeforeMinute(homePageResponse.getData().getBraininjurybefore_minute());
+        //homePage.setTbiAfterDay(homePageResponse.getData().getBraininjuryafter_day());
+        //homePage.setTbiAfterHour(homePageResponse.getData().getBraininjuryafter_hour());
+        //homePage.setTbiAfterMinute(homePageResponse.getData().getBraininjuryafter_minute());
+        //homePage.setTotalFee(homePageResponse.getData().getTotalcost());
+        homePage.setOwnFee(homePageObject.getString("住院自付金额"));
+        homePage.setGeneralFee(homePageObject.getString("一般医疗服务费"));
+        homePage.setServiceFee(homePageObject.getString("一般治疗操作费"));
+        homePage.setNurseFee(homePageObject.getString("护理费"));
+        homePage.setOtherFee(homePageObject.getString("其他费"));
+        homePage.setPathologyFee(homePageObject.getString("病理诊断费"));
+        homePage.setLabFee(homePageObject.getString("实验室诊断费"));
+        homePage.setPacsFee(homePageObject.getString("影像学诊断费"));
+        homePage.setClinicDiagnoseFee(homePageObject.getString("临床诊断项目费"));
+        homePage.setNotOperationFee(homePageObject.getString("非手术治疗项目费"));
+        homePage.setClinicPhysicFee(homePageObject.getString("临床物理治疗费"));
+        homePage.setOperationTreatFee(homePageObject.getString("手术治疗费"));
+        homePage.setAnaesthesiaFee(homePageObject.getString("麻醉费"));
+        homePage.setOperationFee(homePageObject.getString("手术费"));
+        homePage.setHealthTypeFee(homePageObject.getString("康复费"));
+        homePage.setChnTreatFee(homePageObject.getString("中医治疗费"));
+        homePage.setWesternMedFee(homePageObject.getString("西药费"));
+        homePage.setAntibiosisFee(homePageObject.getString("抗菌药物费用"));
+        homePage.setChnMedFee(homePageObject.getString("中成药费"));
+        homePage.setChnHerbFee(homePageObject.getString("中草药费"));
+        homePage.setBloodFee(homePageObject.getString("血费"));
+        homePage.setAlbumenFee(homePageObject.getString("白蛋白类制品费"));
+        homePage.setGlobulinFee(homePageObject.getString("球蛋白类制品费"));
+        homePage.setBloodFactorFee(homePageObject.getString("凝血因子类制品费"));
+        homePage.setCellFactorFee(homePageObject.getString("细胞因子类制品费"));
+        homePage.setCheckMaterialFee(homePageObject.getString("检查用一次性医用材料费"));
+        homePage.setTreatMaterialFee(homePageObject.getString("治疗用一次性医用材料费"));
+        homePage.setOperationMaterialFee(homePageObject.getString("手术用一次性医用材料费"));
+        //homePage.setOtherTypeFee(homePageResponse.getData().getOthercost());
+        homePage.setSingleDiagManage(homePageObject.getString("单病种管理"));
+        homePage.setClinicPathwayManage(homePageObject.getString("临床路径管理"));
+        //homePage.setIsOutpatientBehospital(homePageResponse.getData().getIsOutpatientBehospital());
+        //homePage.setIsLeaveBehospital(homePageResponse.getData().getIsLeaveBehospital());
+        //homePage.setIsOperationBeforeAfter(homePageResponse.getData().getIsOperationBeforeAfter());
+        //homePage.setIsClinicPathology(homePageResponse.getData().getIsClinicPathology());
+        //homePage.setIsRadiatePathology(homePageResponse.getData().getIsRadiatePathology());
+        homePage.setRescueNum(homePageObject.getString("抢救次数"));
+        //homePage.setRescueSuccessNum(homePageResponse.getData().getRescueSuccessNum());
+        //homePage.setIsAutoLeavehospital(homePageResponse.getData().getIsAutoLeavehospital());
+        homePage.setReturnToType(homePageObject.getString("治疗结果"));
+        homePage.setPathologyDiagnoseCode(homePageObject.getString("病理诊断编码"));
+
+        //JSONObject homePageDiagObject = paramsObj.getJSONObject("诊断信息");
+        List<Object> list = paramsObj.getJSONArray("诊断信息");
+        List<HomeDiagnoseInfo> homeDiagnoseInfoList = Lists.newLinkedList();
+        for (int i = 0; i < list.size(); i++) {
+            HomeDiagnoseInfo homeDiagnoseInfo = new HomeDiagnoseInfo();
+            homeDiagnoseInfo.setHomePageId(medicalRecord.getRecId());
+            /*homeDiagnoseInfo.setHomePageId(patientListResponse.getData().get(i).getRDN());*/
+            homeDiagnoseInfo.setHospitalId(Long.parseLong("2"));
+            //homeDiagnoseInfo.setDiagnoseOrderNo(homePageDiagnoseResponse.getData().get(j).getRdn());
+            //homeDiagnoseInfo.setDiagnoseType(homePageDiagnoseResponse.getData().get(j).getPrimaryflag());
+            //homeDiagnoseInfo.setDiagnoseTypeShort(homePageDiagnoseResponse.getData().get(j).getPrimaryflag());
+            homeDiagnoseInfo.setDiagnoseName(((JSONArray) list).getJSONObject(i).getString("诊断名称"));
+            homeDiagnoseInfo.setBehospitalType(((JSONArray) list).getJSONObject(i).getString("入院情况"));
+            homeDiagnoseInfo.setIcdCode(((JSONArray) list).getJSONObject(i).getString("诊断编码"));
+            if (i == 0) {
+                homeDiagnoseInfo.setDiagnoseType("主要诊断");
+            } else {
+                homeDiagnoseInfo.setDiagnoseType("其他诊断");
+            }
+            homeDiagnoseInfoList.add(homeDiagnoseInfo);
+
+        }
+
+        List<Object> list1 = paramsObj.getJSONArray("手术信息");
+        List<HomeOperationInfo> homeOperationInfoList = Lists.newLinkedList();
+        for (int i = 0; i < list1.size(); i++) {
+            HomeOperationInfo homeOperationInfo = new HomeOperationInfo();
+            homeOperationInfo.setHomePageId(medicalRecord.getRecId());
+            /*homeOperationInfo.setHomePageId(patientListResponse.getData().get(i).getRDN());*/
+            homeOperationInfo.setHospitalId(Long.parseLong("2"));
+            homeOperationInfo.setOperationDate(ShaoyfDateUtil.parseDateTime(((JSONArray) list1).getJSONObject(i).getString("手术日期2")));
+            homeOperationInfo.setOperationCode(((JSONArray) list1).getJSONObject(i).getString("手术操作代码"));
+            homeOperationInfo.setOperationName(((JSONArray) list1).getJSONObject(i).getString("手术名称"));
+            homeOperationInfo.setOperationDoctorId(((JSONArray) list1).getJSONObject(i).getString("手术医师"));
+            homeOperationInfo.setFirstAssistantId(((JSONArray) list1).getJSONObject(i).getString("助手"));
+            homeOperationInfo.setSecondAssistantId(((JSONArray) list1).getJSONObject(i).getString("助手II"));
+            homeOperationInfo.setHealingLevel(((JSONArray) list1).getJSONObject(i).getString("切口愈合等级"));
+            homeOperationInfo.setOperationLevel(((JSONArray) list1).getJSONObject(i).getString("手术级别"));
+            homeOperationInfo.setCutLevel(((JSONArray) list1).getJSONObject(i).getString("切口等级"));
+            homeOperationInfo.setAnaesthesiaName(((JSONArray) list1).getJSONObject(i).getString("麻醉方式"));
+
+            homeOperationInfoList.add(homeOperationInfo);
+        }
+
+        homePageServiceImpl.save(homePage);
+        homeDiagnoseInfoService.saveBatch(homeDiagnoseInfoList);
+        homeOperationInfoService.saveBatch(homeOperationInfoList);
+
+    }
+
     /**
      * 终末质控-通过接口更新病历记录
      *

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

@@ -102,6 +102,7 @@ public class ShaoyfDateUtil {
             "yyyy-MM-ddHH:mm:ss.000",
             "yyyyMMddHH:mm",
             "yyyy-MM-dd'T'HH:mm:ss",
+            "yyyy"
     };
 
 

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

@@ -19,15 +19,11 @@ public class ShaoyfHtmlUtil {
 
     public Map<String, Object> getPageMap(String html) {
         Map<String, Object> ret = null;
-        try {
-            ret = new HashMap<>();
-            Document doc = Jsoup.parse(html);
-            ret.put("病案首页", getOtherPageMap(doc));
-            ret.put("手术信息", getOperMaps(doc));
-            ret.put("诊断信息", getDiagMaps(doc));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        ret = new HashMap<>();
+        Document doc = Jsoup.parse(html);
+        ret.put("病案首页", getOtherPageMap(doc));
+        ret.put("手术信息", getOperMaps(doc));
+        ret.put("诊断信息", getDiagMaps(doc));
         return ret;
     }
 

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

@@ -1,13 +1,20 @@
 package com.diagbot.web;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.*;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.facade.data.*;
+import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
+import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.vo.data.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,9 +24,10 @@ import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @RestController
 @RequestMapping("/qc/data")
-@Api(value = "对接接口API", tags = { "对接接口API" })
+@Api(value = "对接接口API", tags = {"对接接口API"})
 public class DataController {
 
     @Autowired
@@ -61,140 +69,147 @@ public class DataController {
     @Autowired
     private AMedPacsResultFacade aMedPacsResultFacade;
 
+    @Autowired
+    @Qualifier("medicalRecordServiceImpl")
+    private MedicalRecordServiceImpl medicalRecordService;
+
+    @Autowired
+    private MedicalRecordContentServiceImpl medicalRecordContentServiceImpl;
+
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
     @SysLogger("sendDoctorInfos")
-    public RespDTO<List<ABasDoctorInfoDTO>> sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list){
+    public RespDTO<List<ABasDoctorInfoDTO>> sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list) {
         return aBasDoctorInfoFacade.executeDoctor(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院所有有效科室的基本信息")
     @PostMapping("/sendDeptInfos")
     @SysLogger("sendDeptInfos")
-    public RespDTO<List<ABasDeptInfoDTO>> sendDeptInfos(@RequestBody List<ABasDeptInfoVO> list){
+    public RespDTO<List<ABasDeptInfoDTO>> sendDeptInfos(@RequestBody List<ABasDeptInfoVO> list) {
         return aBasDeptInfoFacade.executeDept(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院所有文书模板基本信息")
     @PostMapping("/sendRecordTypes")
     @SysLogger("sendRecordTypes")
-    public RespDTO<List<AMedicalRecordTypeDTO>> sendRecordTypes(@RequestBody List<AMedicalRecordTypeVO> list){
+    public RespDTO<List<AMedicalRecordTypeDTO>> sendRecordTypes(@RequestBody List<AMedicalRecordTypeVO> list) {
         return aMedRecordTypeFacade.executeMRType(list);
     }
 
     @ApiOperation(value = "运行质控-评分-文书信息")
     @PostMapping("/sendMrRecordIng")
     @SysLogger("sendMrRecordIng")
-    public RespDTO<Map<String, Object>> sendMrRecordIng(@Valid @RequestBody AMrContentVO aMrContentVO){
+    public RespDTO<Map<String, Object>> sendMrRecordIng(@Valid @RequestBody AMrContentVO aMrContentVO) {
         return aMedicalRecordFacade.executeMrRecordIng(aMrContentVO);
     }
 
     @ApiOperation(value = "终末质控-文书信息")
     @PostMapping("/sendMrRecord")
     @SysLogger("sendMrRecord")
-    public RespDTO<List<AMedicalRecordDTO>> sendMrRecord(@RequestBody List<AMedicalRecordVO> list){
+    public RespDTO<List<AMedicalRecordDTO>> sendMrRecord(@RequestBody List<AMedicalRecordVO> list) {
         return aMedicalRecordFacade.executeMrRecord(list);
     }
 
     @ApiOperation(value = "终末质控-文书详情")
     @PostMapping("/sendMrContent")
     @SysLogger("sendMrContent")
-    public RespDTO<List<AMedicalRecordContentDTO>> sendMrContent(@RequestBody List<AMedicalRecordContentVO> list){
+    public RespDTO<List<AMedicalRecordContentDTO>> sendMrContent(@RequestBody List<AMedicalRecordContentVO> list) {
         return aMedicalRecordContentFacade.executeMrRecordContent(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院病人住院记录信息")
     @PostMapping("/sendPatientInfo")
     @SysLogger("sendPatientInfo")
-    public RespDTO<List<ABehospitalInfoDTO>> sendPatientInfo(@RequestBody List<ABehospitalInfoVO> list){
+    public RespDTO<List<ABehospitalInfoDTO>> sendPatientInfo(@RequestBody List<ABehospitalInfoVO> list) {
         return aBehospitalInfoFacade.executeBehospital(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院医生医嘱信息")
     @PostMapping("/sendDoctorAdvice")
     @SysLogger("sendDoctorAdvice")
-    public RespDTO<List<ADoctorAdviceDTO>> sendDoctorAdvice(@RequestBody List<ADoctorAdviceVO> list){
+    public RespDTO<List<ADoctorAdviceDTO>> sendDoctorAdvice(@RequestBody List<ADoctorAdviceVO> list) {
         return aDoctorAdviceFacade.executeDoctorAdvice(list);
     }
 
     @ApiOperation(value = "运行质控-获取病案首页")
     @PostMapping("/sendHomePageIng")
     @SysLogger("sendHomePageIng")
-    public RespDTO<Map<String, Object>> sendHomePageIng(@Valid @RequestBody AHomePageIngVO aHomePageIngVO){
+    public RespDTO<Map<String, Object>> sendHomePageIng(@Valid @RequestBody AHomePageIngVO aHomePageIngVO) {
         return aHomePageFacade.executeHomePageIng(aHomePageIngVO);
     }
 
     @ApiOperation(value = "终末质控-获取病案首页")
     @PostMapping("/sendHomePage")
     @SysLogger("sendHomePage")
-    public RespDTO<List<AHomePageDTO>> sendHomePage(@RequestBody List<AHomePageVO> list){
+    public RespDTO<List<AHomePageDTO>> sendHomePage(@RequestBody List<AHomePageVO> list) {
         return aHomePageFacade.executeHomePage(list);
     }
 
     @ApiOperation(value = "终末质控-获取病案首页诊断")
     @PostMapping("/sendHomeDiagnose")
     @SysLogger("sendHomeDiagnose")
-    public RespDTO<List<AHomeDiagnoseDTO>> sendHomeDiagnose(@RequestBody List<AHomeDiagnoseVO> list){
+    public RespDTO<List<AHomeDiagnoseDTO>> sendHomeDiagnose(@RequestBody List<AHomeDiagnoseVO> list) {
         return aHomeDiagnoseInfoFacade.executeHomeDiagnose(list);
     }
 
     @ApiOperation(value = "终末质控-获取病案首页手术")
     @PostMapping("/sendHomeOperation")
     @SysLogger("sendHomeOperation")
-    public RespDTO<List<AHomeOperationDTO>> sendHomeOperation(@RequestBody List<AHomeOperationVO> list){
+    public RespDTO<List<AHomeOperationDTO>> sendHomeOperation(@RequestBody List<AHomeOperationVO> list) {
         return RespDTO.onSuc(aHomeOperationInfoFacade.executeHomeOperation(list));
     }
 
     @ApiOperation(value = "危急值")
     @PostMapping("/sendCrisis")
     @SysLogger("sendCrisis")
-    public RespDTO<List<AMedCrisisDTO>> sendCrisis(@RequestBody List<AMedCrisisVO> list){
+    public RespDTO<List<AMedCrisisDTO>> sendCrisis(@RequestBody List<AMedCrisisVO> list) {
         return aMedCrisisFacade.executeMedCrisis(list);
     }
 
     @ApiOperation(value = "检查")
     @PostMapping("/sendPacsResults")
     @SysLogger("sendPacsResults")
-    public RespDTO<List<AMedPacsResultVO>> sendPacsResults(@RequestBody List<AMedPacsResultVO> list){
+    public RespDTO<List<AMedPacsResultVO>> sendPacsResults(@RequestBody List<AMedPacsResultVO> list) {
         return aMedPacsResultFacade.executeMedPacsResult(list);
     }
 
     @ApiOperation(value = "化验")
     @PostMapping("/sendLisResults")
     @SysLogger("sendLisResults")
-    public RespDTO<List<AMedLisResultVO>> sendLisResults(@RequestBody List<AMedLisResultVO> list){
+    public RespDTO<List<AMedLisResultVO>> sendLisResults(@RequestBody List<AMedLisResultVO> list) {
         return aMedLisResultFacade.executeMedLisResult(list);
     }
 
     @ApiOperation(value = "数据引擎-删除标识")
     @PostMapping("/deleteFlag")
     @SysLogger("deleteFlag")
-    public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO){
-        if("brzyxx".equals(aDeleteFlagVO.getModeType())){
+    public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO) {
+        if ("brzyxx".equals(aDeleteFlagVO.getModeType())) {
             //住院登记
             aBehospitalInfoFacade.deleteFlag(aDeleteFlagVO);
-        }else if("bryz".equals(aDeleteFlagVO.getModeType())){
+        } else if ("bryz".equals(aDeleteFlagVO.getModeType())) {
             //病人医嘱
             aDoctorAdviceFacade.deleteFlag(aDeleteFlagVO);
-        }else if("basyxx".equals(aDeleteFlagVO.getModeType())){
+        } else if ("basyxx".equals(aDeleteFlagVO.getModeType())) {
             //病案首页
             aHomePageFacade.deleteFlag(aDeleteFlagVO);
-        }else if("basyzd".equals(aDeleteFlagVO.getModeType())){
+        } else if ("basyzd".equals(aDeleteFlagVO.getModeType())) {
             //病案诊断
             aHomeDiagnoseInfoFacade.deleteFlag(aDeleteFlagVO);
-        }else if("basyss".equals(aDeleteFlagVO.getModeType())){
+        } else if ("basyss".equals(aDeleteFlagVO.getModeType())) {
             //病案手术
             aHomeOperationInfoFacade.deleteFlag(aDeleteFlagVO);
-        }else if("wsxx".equals(aDeleteFlagVO.getModeType())){
+        } else if ("wsxx".equals(aDeleteFlagVO.getModeType())) {
             //文书信息
             aMedicalRecordFacade.deleteFlag(aDeleteFlagVO);
-        }else if("wsnr".equals(aDeleteFlagVO.getModeType())){
+        } else if ("wsnr".equals(aDeleteFlagVO.getModeType())) {
             //文书内容
             aMedicalRecordContentFacade.deleteFlag(aDeleteFlagVO);
-        }else if("hyjg".equals(aDeleteFlagVO.getModeType())){
+        } else if ("hyjg".equals(aDeleteFlagVO.getModeType())) {
             //文书内容
             aMedLisResultFacade.deleteFlag(aDeleteFlagVO);
-        }else if("jcjg".equals(aDeleteFlagVO.getModeType())){
+        } else if ("jcjg".equals(aDeleteFlagVO.getModeType())) {
             //文书内容
             aMedPacsResultFacade.deleteFlag(aDeleteFlagVO);
         }
@@ -204,8 +219,24 @@ public class DataController {
     @ApiOperation(value = "筛选病案首页的手术诊断信息")
     @PostMapping("/selectDataAndSave")
     @SysLogger("selectDataAndSave")
-    public void selectDataAndSave(){
-        aMedicalRecordFacade.selectDataAndSave();
-    }
+    public void selectDataAndSave() {
+        QueryWrapper<MedicalRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mode_id", 6);
+        List<MedicalRecord> medicalRecordList = medicalRecordService.list(queryWrapper);
+        if (medicalRecordList.size() > 0) {
+            medicalRecordList.stream().forEach(s -> {
+                try {
+                    MedicalRecordContent medicalRecordContent =
+                            medicalRecordContentServiceImpl.getOne(
+                                    new QueryWrapper<MedicalRecordContent>()
+                                            .eq("rec_id", s.getRecId())
+                                            .select("html_text,rec_id"));
+                    aMedicalRecordFacade.selectDataAndSave(medicalRecordContent, s);
+                } catch (Exception e) {
+                    log.error(s.getRecId(), e.getMessage());
+                }
+            });
 
+        }
+    }
 }