sss

pom.xml

@@ -210,6 +210,23 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-frontend-jaxws -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>3.1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>3.1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <version>3.1.10</version>
+        </dependency>
+
     </dependencies>
 
     <!-- 私有仓库 -->

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABasDoctorInfoDTO;
@@ -9,11 +10,26 @@ import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABasDoctorInfoVO;
+import com.diagbot.vo.data.XMHIPMessageServerVo;
 import com.google.common.collect.Lists;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.Date;
 import java.util.List;
 
@@ -97,4 +113,46 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
             aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息","", JSON.toJSONString(basDoctorInfoList),"",e.getMessage());
         }
     }
+
+
+    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 value;
+            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);
+            }
+
+
+
+            JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
+            Client client = dcf.createClient("http://192.168.12.92:9090/services/HIPMessageServer?wsdl");
+            //
+            // client.getOutInterceptors().add需要密码的情况需要加上用户名和密码(new ClientLoginInterceptor(USER_NAME,
+            // PASS_WORD));
+            Object[] objects;
+            String s ="OrganizationInfoQuery";
+
+            XMHIPMessageServerVo serverVo =new XMHIPMessageServerVo();
+            serverVo.setAction(s);
+            serverVo.setMessage(in);
+
+//        List<RegisterInfoDTO> list1 = Lists.newArrayList();
+            objects = client.invoke("HIPMessageServer",serverVo);
+
+
+            System.out.println("返回数据:" + objects[0].toString());
+        }catch (Exception e){
+            e.getMessage();
+        }
+
+
+
+    }
 }

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

@@ -9,7 +9,9 @@ import com.diagbot.service.impl.MedCrisisInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.data.AMedCrisisVO;
+import com.diagbot.vo.data.HisViewVo;
 import com.google.common.collect.Lists;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -25,6 +27,10 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl {
     private MedCrisisInfoServiceImpl medCrisisInfoService;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Autowired
+    private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
 
     public RespDTO<List<AMedCrisisDTO>> executeMedCrisis(List<AMedCrisisVO> list) {
         if (list != null && list.size() > 0) {
@@ -63,6 +69,12 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl {
         List<MedCrisisInfo> updateE = Lists.newLinkedList();
         if (medCrisisList != null && medCrisisList.size() > 0) {
             medCrisisList.forEach(s -> {
+
+                HisViewVo hisViewVo = new HisViewVo();
+                BeanUtils.copyProperties(s,hisViewVo);
+                aMedicalRecordContentFacade.executeByView(hisViewVo);
+                aMedicalRecordFacade.executeByView(hisViewVo,"23");
+
                 try {
                     MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()
                             .eq("rec_id", s.getRecId())

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

@@ -66,7 +66,10 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
      * @param hisViewVo
      */
     public void executeByView(HisViewVo hisViewVo){
-        String contentText=hisViewVo.getContentText();
+        String contentText="1";
+        if (null !=hisViewVo.getContentText()){
+            contentText=hisViewVo.getContentText();
+        }
         if (hisViewVo.getContentText1()!=null){
             contentText+=hisViewVo.getContentText1();
             if (hisViewVo.getContentText2()!=null){
@@ -74,7 +77,7 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
             }
         }
         MedicalRecordContent medicalRecordContent = new MedicalRecordContent();
-        medicalRecordContent.setContentText(contentText);
+        medicalRecordContent.setXmlText(contentText);
         medicalRecordContent.setRecId(hisViewVo.getRecId());
         medicalRecordContent.setHospitalId(hisViewVo.getHospitalId());
         List<MedicalRecordContent> medicalRecordContents = new ArrayList<>();

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

@@ -360,7 +360,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             if (medicalRecordList != null && medicalRecordList.size() > 0) {
                 medicalRecordList.stream().forEach(s -> {
                     //初始化mode_id
-                    Long modeId = initModeId(s);
+//                    Long modeId = initModeId(s);
+                    Long modeId =s.getModeId();
                     if (modeId == Long.valueOf("0")) {
                         //新增类型到监测表中
                         QcAbnormal qcAbnormal = new QcAbnormal();
@@ -523,4 +524,19 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
     }
 
+
+    /**
+     * 从病例取出文本存到
+     * @param hisViewVo
+     */
+    public void executeByView(HisViewVo hisViewVo,String modeId){
+
+        MedicalRecord medicalRecord = new MedicalRecord();
+        BeanUtil.copyProperties(hisViewVo,medicalRecord);
+        medicalRecord.setModeId(Long.valueOf(modeId));
+        List<MedicalRecord> medicalRecords = new ArrayList<>();
+        medicalRecords.add(medicalRecord);
+        this.execute(medicalRecords);
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrAdmissionNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -36,6 +37,8 @@ public class AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
 
     public void getColumnZhAndCh() {
         List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
@@ -108,15 +111,11 @@ public class AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<FJStrAdmissionNoteVo> strAdmissionNoteVos,String modelName) {
+    public  void getOneList(List<FJStrAdmissionNoteVo> strAdmissionNoteVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (FJStrAdmissionNoteVo s: strAdmissionNoteVos) {
@@ -133,11 +132,29 @@ public class AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
             }
 
             StrAdmissionNote strAdmissionNote =new StrAdmissionNote();
-            strAdmissionNote = (StrAdmissionNote) MapUtil.mapToObject(map, StrAdmissionNote.class);
-            BeanUtils.copyProperties(strAdmissionNoteVos.get(0),strAdmissionNote);
+            AStrAdmissionNoteVO aStrAdmissionNoteVO = (AStrAdmissionNoteVO) MapUtil.mapToObject(map, AStrAdmissionNoteVO.class);
+            BeanUtils.copyProperties(aStrAdmissionNoteVO,strAdmissionNote);
             strAdmissionNote.setWholeData(JSON.toJSONString(wholeData));
 
+            BeanUtils.copyProperties(strAdmissionNoteVos.get(0),strAdmissionNote);
+
+            strAdmissionNote.setAuditDate(DateUtil.parseDateTime(aStrAdmissionNoteVO.getAuditDate()));//审核时间
+            strAdmissionNote.setRecDate(DateUtil.parseDateTime(aStrAdmissionNoteVO.getRecDate()));//记录时间
+            strAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(aStrAdmissionNoteVO.getBehospitalDate()));//入院日期
+            strAdmissionNote.setBirthday(DateUtil.parseDate(aStrAdmissionNoteVO.getBirthday()));//出生日期
+            strAdmissionNote.setRecordDate(DateUtil.parseDateTime(aStrAdmissionNoteVO.getRecordDate()));//病历日期
+
+
+                HisViewVo hisViewVo = new HisViewVo();
+                BeanUtils.copyProperties(strAdmissionNoteVos.get(0),hisViewVo);
+                aMedicalRecordContentFacade.executeByView(hisViewVo);
+                aMedicalRecordFacade.executeByView(hisViewVo,modeId);
+
+
+
             this.dealData(strAdmissionNote);
+
+
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录多变一", strAdmissionNoteVos.get(0).getRecId(), JSON.toJSONString(strAdmissionNoteVos), "", e.getMessage());

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

@@ -12,6 +12,7 @@ import com.diagbot.entity.StrBloodResult;
 import com.diagbot.entity.StrFirstRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrBloodResultServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -36,22 +37,19 @@ public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
+
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
                 if (s.getKeyEn()!=null) {
@@ -70,10 +68,9 @@ public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strBloodResult);
             strBloodResult.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(strBloodResult);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrBloodResult;
 import com.diagbot.entity.StrBloodTransfusion;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrBloodTransfusionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -39,21 +40,18 @@ public class AStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
+
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -73,10 +71,8 @@ public class AStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strBloodTransfusion);
             strBloodTransfusion.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(strBloodTransfusion);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrConsultationApply;
 import com.diagbot.entity.StrRescueNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrConsultationApplyServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -37,21 +38,17 @@ public class AStrConsultationApplyFacade extends StrConsultationApplyServiceImpl
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -75,10 +72,8 @@ public class AStrConsultationApplyFacade extends StrConsultationApplyServiceImpl
             BeanUtils.copyProperties(hisViewVos.get(0),strConsultationApply);
             strConsultationApply.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(strConsultationApply);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrConsultationNote;
 import com.diagbot.entity.StrRescueNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrConsultationNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -39,21 +40,17 @@ public class AStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -73,10 +70,8 @@ public class AStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strConsultationNote);
             strConsultationNote.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(strConsultationNote);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrConsultationRecord;
 import com.diagbot.entity.StrRescueNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrConsultationRecordServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -37,21 +38,17 @@ public class AStrConsultationRecordFacade extends StrConsultationRecordServiceIm
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -71,10 +68,8 @@ public class AStrConsultationRecordFacade extends StrConsultationRecordServiceIm
             BeanUtils.copyProperties(hisViewVos.get(0),strConsultationRecord);
             strConsultationRecord.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(strConsultationRecord);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrConsultationResult;
 import com.diagbot.entity.StrRescueNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrConsultationResultServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -38,21 +39,17 @@ public class AStrConsultationResultFacade extends StrConsultationResultServiceIm
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -72,10 +69,8 @@ public class AStrConsultationResultFacade extends StrConsultationResultServiceIm
             BeanUtils.copyProperties(hisViewVos.get(0),strConsultationResult);
             strConsultationResult.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(strConsultationResult);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrDeathDiscussion;
 import com.diagbot.entity.StrDeathNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrDeathDiscussionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -37,21 +38,17 @@ public class AStrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -79,10 +76,8 @@ public class AStrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
             strDeathDiscussion.setDiscussDate(DateUtil.parseDate(aStrDeathDiscussionVO.getDiscussDate(),"yyyy-MM-dd HH:mm"));//讨论时间
             strDeathDiscussion.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(strDeathDiscussion);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrDeathNote;
 import com.diagbot.entity.StrDifficultCase;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrDeathNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -37,21 +38,17 @@ public class AStrDeathNoteFacade extends StrDeathNoteServiceImpl {
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -75,10 +72,8 @@ public class AStrDeathNoteFacade extends StrDeathNoteServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strDeathNote);
             strDeathNote.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(strDeathNote);
         } catch (Exception e) {

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

@@ -9,6 +9,7 @@ import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.*;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrDifficultCaseServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -36,21 +37,17 @@ public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -71,12 +68,10 @@ public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
             strDifficultCase.setDiscussDate(DateUtil.parseDate(strDifficultCaseVO.getDiscussDate(),"yyyy-MM-dd HH:mm"));//结束时间
 
             BeanUtils.copyProperties(hisViewVos.get(0),strDifficultCase);
-            strDifficultCase.setWholeData(String.valueOf(wholeData));
+            strDifficultCase.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(strDifficultCase);
         } catch (Exception e) {

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

@@ -10,6 +10,7 @@ import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.entity.StrFirstRecord;
 import com.diagbot.enums.CacheKeyEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrFirstRecordServiceImpl;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.MedicalRecordContent;
@@ -37,22 +38,22 @@ public class AStrFirstRecordFacade extends StrFirstRecordServiceImpl {
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
 
 
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
+
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
+
 
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -72,10 +73,9 @@ public class AStrFirstRecordFacade extends StrFirstRecordServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strFirstRecord);
             strFirstRecord.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(strFirstRecord);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrIllCritically;
 import com.diagbot.entity.StrTransferOutNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrIllCriticallyServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -38,21 +39,17 @@ public class AStrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -76,10 +73,8 @@ public class AStrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strIllCritically);
             strIllCritically.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(strIllCritically);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrIllCritically;
 import com.diagbot.entity.StrIllSeriousl;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrIllSeriouslServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -39,21 +40,17 @@ public class AStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -76,10 +73,8 @@ public class AStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strIllSeriousl);
             strIllSeriousl.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(strIllSeriousl);
         } catch (Exception e) {

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.diagbot.entity.StrInformedConsent;
 import com.diagbot.entity.StrTalkInform;
 import com.diagbot.service.impl.StrInformedConsentServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.vo.data.HisViewVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -17,11 +19,24 @@ public class AStrInformedConsentFacade extends StrInformedConsentServiceImpl {
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
+
+    @Autowired
+    private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+
     public void execute(List<StrInformedConsent> strInformedConsents){
 
         if (strInformedConsents != null && strInformedConsents.size() > 0) {
             strInformedConsents.forEach(s -> {
                 try {
+                    strInformedConsents.forEach(str->{
+                        HisViewVo hisViewVo =new HisViewVo();
+                        BeanUtil.copyProperties(str,hisViewVo);
+                        aMedicalRecordContentFacade.executeByView(hisViewVo);
+                        aMedicalRecordFacade.executeByView(hisViewVo,"54");
+                    });
+
                     StrInformedConsent strInformedConsent = this.getOne(new QueryWrapper<StrInformedConsent>()
                             .eq("rec_id", s.getRecId())
                             .eq("hospital_id", s.getHospitalId())

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

@@ -9,7 +9,9 @@ import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.entity.StrLeaveHospital;
 import com.diagbot.entity.StrRescueNote;
+import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrLeaveHospitalServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -35,29 +37,27 @@ public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-            list.forEach(s -> {
-                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-            });
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
+            Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
-                if (s.getKeyEn()!=null){
-                    for (int i = 0; i < list.size(); i++) {
-                        if (s.getKeyEn().equals(list.get(i).getEn())){
-                            map.put(s.getKeyEn(),s.getDeValue());
-                            wholeData.put(list.get(i).getCh(),s.getDeValue());
+                if (s.getKeyEn()!=null) {
+                    tableKey.forEach((k, v) -> {
+                        if (s.getKeyEn().equals(v)) {
+                            map.put(s.getKeyEn(), s.getDeValue());
+                            wholeData.put(k, s.getDeValue());
                         }
-                    }
+                    });
                 }else {
                     wholeData.put(s.getKeyCN(),s.getDeValue());
                 }
@@ -114,10 +114,8 @@ public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
                 strLeaveHospital.setBehospitalDayNum(String.valueOf(day));
             }
 
-            //判断是否有文本 如果有获取它
-            if (hisViewVos.get(0).getContentText()!=null){
-                aMedicalRecordContentFacade.executeByView(hisViewVos.get(0));
-            }
+            aMedicalRecordContentFacade.executeByView(hisViewVos.get(0));
+            aMedicalRecordFacade.executeByView(hisViewVos.get(0),modeId);
 
             this.dealData(strLeaveHospital);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrDeathDiscussion;
 import com.diagbot.entity.StrOperativeFirstRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrOperativeFirstRecordServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -35,21 +36,17 @@ public class AStrOperativeFirstRecord extends StrOperativeFirstRecordServiceImpl
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -90,10 +87,8 @@ public class AStrOperativeFirstRecord extends StrOperativeFirstRecordServiceImpl
             BeanUtils.copyProperties(hisViewVos.get(0),strOperativeFirstRecord);
             strOperativeFirstRecord.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(strOperativeFirstRecord);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrOperativeNote;
 import com.diagbot.entity.StrPreoperativeDiscussion;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrOperativeNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -35,21 +36,17 @@ public class AStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -89,10 +86,8 @@ public class AStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strOperativeNote);
             strOperativeNote.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(strOperativeNote);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrPeriodConclusion;
 import com.diagbot.entity.StrRescueNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrPeriodConclusionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -35,21 +36,17 @@ public class AStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -69,10 +66,8 @@ public class AStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strPeriodConclusion);
             strPeriodConclusion.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(strPeriodConclusion);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrOperativeFirstRecord;
 import com.diagbot.entity.StrPreoperativeDiscussion;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrPreoperativeDiscussionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -37,21 +38,17 @@ public class AStrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionS
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //得到表所对应的中文名和英文名
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -76,10 +73,8 @@ public class AStrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionS
             BeanUtils.copyProperties(hisViewVos.get(0),strPreoperativeDiscussion);
             strPreoperativeDiscussion.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(strPreoperativeDiscussion);
         } catch (Exception e) {

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

@@ -9,7 +9,9 @@ import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.entity.StrOperativeNote;
 import com.diagbot.entity.StrRescueNote;
+import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrRescueNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -37,29 +39,27 @@ public class AStrRescueNoteFacade extends StrRescueNoteServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-            list.forEach(s -> {
-                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
+            Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
+
             for (HisViewVo s: hisViewVos) {
-                if (s.getKeyEn()!=null){
-                    for (int i = 0; i < list.size(); i++) {
-                        if (s.getKeyEn().equals(list.get(i).getEn())){
-                            map.put(s.getKeyEn(),s.getDeValue());
-                            wholeData.put(list.get(i).getCh(),s.getDeValue());
+                if (s.getKeyEn()!=null) {
+                    tableKey.forEach((k, v) -> {
+                        if (s.getKeyEn().equals(v)) {
+                            map.put(s.getKeyEn(), s.getDeValue());
+                            wholeData.put(k, s.getDeValue());
                         }
-                    }
+                    });
                 }else {
                     wholeData.put(s.getKeyCN(),s.getDeValue());
                 }

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

@@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.diagbot.entity.MedCrisisInfo;
+import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.StrTalkInform;
 import com.diagbot.service.impl.StrTalkInformServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.vo.data.HisViewVo;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,11 +23,24 @@ public class AStrTalkInformFacade extends StrTalkInformServiceImpl {
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
+
+    @Autowired
+    private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+
     public void execute(List<StrTalkInform> strTalkInforms){
 
         if (strTalkInforms != null && strTalkInforms.size() > 0) {
             strTalkInforms.forEach(s -> {
                 try {
+                    strTalkInforms.forEach(str->{
+                        HisViewVo hisViewVo =new HisViewVo();
+                        BeanUtil.copyProperties(str,hisViewVo);
+                        aMedicalRecordContentFacade.executeByView(hisViewVo);
+                        aMedicalRecordFacade.executeByView(hisViewVo,"53");
+                    });
+
                     StrTalkInform strTalkInform = this.getOne(new QueryWrapper<StrTalkInform>()
                             .eq("rec_id", s.getRecId())
                             .eq("hospital_id", s.getHospitalId())

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrBloodTransfusion;
 import com.diagbot.entity.StrTransferInNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrTransferInNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -39,21 +40,17 @@ public class AStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -68,15 +65,15 @@ public class AStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
                     wholeData.put(s.getKeyCN(),s.getDeValue());
                 }
             }
+
             StrTransferInNote strTransferInNote =new StrTransferInNote();
             strTransferInNote = (StrTransferInNote) MapUtil.mapToObject(map, StrTransferInNote.class);
             BeanUtils.copyProperties(hisViewVos.get(0),strTransferInNote);
             strTransferInNote.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(strTransferInNote);
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.StrTransferInNote;
 import com.diagbot.entity.StrTransferOutNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrTransferOutNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -39,21 +40,17 @@ public class AStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
 
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
     /**
      * 把得到的list变成一个对象
      * @param
      */
-    public  void getOneList(List<HisViewVo> hisViewVos,String modelName) {
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            //得到咱表中的字段名字然后把下划线转变为驼峰
-//            List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-//            list.forEach(s -> {
-//                s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-//            });
-            //循环list根据咱字段的名称来跟得到的数据来做比较
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -73,10 +70,8 @@ public class AStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
             BeanUtils.copyProperties(hisViewVos.get(0),strTransferOutNote);
             strTransferOutNote.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(strTransferOutNote);
         } catch (Exception e) {

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

@@ -12,14 +12,13 @@ import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.entity.StrWardRecord;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.service.impl.StrWardRecordServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.*;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrWardRecordVO;
 import com.diagbot.vo.data.FJStrAdmissionNoteVo;
+import com.diagbot.vo.data.HisViewVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -33,6 +32,61 @@ public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
     private ColumnFacade columnFacade;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Autowired
+    private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
+
+    /**
+     * 把得到的list变成一个对象
+     * @param
+     */
+    public  void getOneList(List<HisViewVo> hisViewVos,String modeId) {
+        try {
+            Map<String,Object> map =new HashMap<>();
+            Map<String,Object> wholeData =new HashMap<>();
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
+            Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
+
+            //循环list根据咱字段的名称来跟得到的数据来做比较
+            for (HisViewVo s: hisViewVos) {
+                if (s.getKeyEn()!=null) {
+                    tableKey.forEach((k, v) -> {
+                        if (s.getKeyEn().equals(v)) {
+                            map.put(s.getKeyEn(), s.getDeValue());
+                            wholeData.put(k, s.getDeValue());
+                        }
+                    });
+                }else {
+                    wholeData.put(s.getKeyCN(),s.getDeValue());
+                }
+            }
+            StrWardRecord strWardRecord =new StrWardRecord();
+            AStrWardRecordVO strWardRecordVO = (AStrWardRecordVO) MapUtil.mapToObject(map, AStrWardRecordVO.class);
+            BeanUtils.copyProperties(strWardRecordVO,strWardRecord);
+            strWardRecord.setWholeData(JSON.toJSONString(wholeData));
+            BeanUtils.copyProperties(hisViewVos.get(0),strWardRecord);
+
+
+
+            strWardRecord.setAuditDate(DateUtil.parseDateTime(strWardRecordVO.getAuditDate()));//审核时间
+            strWardRecord.setRecDate(DateUtil.parseDateTime(strWardRecordVO.getRecDate()));//记录时间
+            strWardRecord.setWardDate(DateUtil.parseDate(strWardRecordVO.getWardDate()));//查房时间
+            strWardRecord.setRecDate(DateUtil.parseDate(strWardRecordVO.getRecDate()));//病例时间
+
+            aMedicalRecordContentFacade.executeByView(hisViewVos.get(0));
+            aMedicalRecordFacade.executeByView(hisViewVos.get(0),modeId);
+
+
+
+            this.dealData(strWardRecord);
+
+
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("查房记录", hisViewVos.get(0).getRecId(), JSON.toJSONString(hisViewVos.get(0)), "", e.getMessage());
+        }
+    }
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -83,30 +137,14 @@ public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
 
     }
 
-    public void dealData(StrWardRecord medWardRecord,String modelName){
+    public void dealData(StrWardRecord medWardRecord){
         try {
-            Map<String,Object> listMap =this.objectToMap(medWardRecord);
-            Map<String,Object> map = new HashMap<>();
-            //得到表所对应的中文名和英文名
-            Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
-            if (listMap.size()>0){
-                listMap.forEach((k,v)->{
-                    tableKey.forEach((tableK,tableV)->{
-                        if (k.equals(tableV) && null!=v){
-                            map.put(tableK,v);
-                        }
-                    });
-                });
-            }
-
             //判断数据库中是否存在，不存在insert
             if(isExist(medWardRecord)){
                 medWardRecord.setGmtCreate(new Date());//记录创建时间
-                medWardRecord.setWholeData(JSON.toJSONString(map));
                 this.save(medWardRecord);
             }else{
                 medWardRecord.setGmtModified(new Date());//记录修改时间
-                medWardRecord.setWholeData(JSON.toJSONString(map));
                 this.update(medWardRecord,new QueryWrapper<StrWardRecord>()
                         .eq("rec_id", medWardRecord.getRecId())
                         .eq("hospital_id", medWardRecord.getHospitalId())

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

@@ -189,102 +189,107 @@ public class StructuralDataFacade {
             if("首次病程录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrFirstRecordFacade.getOneList(hisViewVos,modelName);
+                    aStrFirstRecordFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("输血后效果评价".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrBloodResultFacade.getOneList(hisViewVos,modelName);
+                    aStrBloodResultFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("输血/血制品病程记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrBloodTransfusionFacade.getOneList(hisViewVos,modelName);
+                    aStrBloodTransfusionFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("转入记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrTransferInNoteFacade.getOneList(hisViewVos,modelName);
+                    aStrTransferInNoteFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("转出记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrTransferOutNoteFacade.getOneList(hisViewVos,modelName);
+                    aStrTransferOutNoteFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("病危通知书".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrIllCriticallyFacade.getOneList(hisViewVos,modelName);
+                    aStrIllCriticallyFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("病重通知书".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrIllSeriouslFacade.getOneList(hisViewVos,modelName);
+                    aStrIllSeriouslFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("疑难病例讨论记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrDifficultCaseFacade.getOneList(hisViewVos,modelName);
+                    aStrDifficultCaseFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("死亡记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrDeathNoteFacade.getOneList(hisViewVos,modelName);
+                    aStrDeathNoteFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("死亡病例讨论记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getMedDeathDiscussion(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrDeathDiscussionFacade.getOneList(hisViewVos,modelName);
+                    aStrDeathDiscussionFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("术后首次病程及谈话记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrOperativeFirstRecord.getOneList(hisViewVos,modelName);
+                    aStrOperativeFirstRecord.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("术前讨论、术前小结".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrPreoperativeDiscussionFacade.getOneList(hisViewVos,modelName);
+                    aStrPreoperativeDiscussionFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("手术记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrOperativeNoteFacade.getOneList(hisViewVos,modelName);
+                    aStrOperativeNoteFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("抢救记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrRescueNoteFacade.getOneList(hisViewVos,modelName);
+                    aStrRescueNoteFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("出院小结".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrLeaveHospitalFacade.getOneList(hisViewVos,modelName);
+                    aStrLeaveHospitalFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("会诊申请单".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrConsultationApplyFacade.getOneList(hisViewVos,modelName);
+                    aStrConsultationApplyFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("会诊结果单".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrConsultationResultFacade.getOneList(hisViewVos,modelName);
+                    aStrConsultationResultFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if("会诊单".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrConsultationNoteFacade.getOneList(hisViewVos,modelName);
+                    aStrConsultationNoteFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if ("会诊记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrConsultationRecordFacade.getOneList(hisViewVos,modelName);
+                    aStrConsultationRecordFacade.getOneList(hisViewVos,s.getModeId());
                 }
             } else if("阶段小结".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrPeriodConclusionFacade.getOneList(hisViewVos,modelName);
+                    aStrPeriodConclusionFacade.getOneList(hisViewVos,s.getModeId());
+                }
+            }else if("查房记录".equals(modelName)){
+                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
+                if (hisViewVos.size()>0){
+                    aStrWardRecordFacade.getOneList(hisViewVos,s.getModeId());
                 }
             }else if ("病案首页".equals(modelName)){
                 /**
@@ -317,23 +322,25 @@ public class StructuralDataFacade {
                 if (doctorAdvice.size()>0){
                     aDoctorAdviceFacade.execute(doctorAdvice);
                 }
-            }else if ("入院登记".equals(modelName)){
-                String sql ="select * from "+s.getTableName()+"   where  behospitalCode='"+s.getBehospitalCode()+"'" ;
-                List<BehospitalInfo> behospitalInfo =fjtzdbConnHarp.getBehospitalInfo(sql);
-                if (behospitalInfo.size()>0){
+            }else if ("入院登记".equals(modelName)) {
+                String sql = "select * from " + s.getTableName() + "   where  behospitalCode='" + s.getBehospitalCode() + "'";
+                List<BehospitalInfo> behospitalInfo = fjtzdbConnHarp.getBehospitalInfo(sql);
+                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);
@@ -351,17 +358,12 @@ public class StructuralDataFacade {
             }else if("入院记录".equals(modelName)){
                 List<FJStrAdmissionNoteVo> medAdmissionNote =fjtzdbConnHarp.getMedAdmissionNote(this.sql(s));
                 if (medAdmissionNote.size()>0){
-                    aStrAdmissionNoteFacade.getOneList(medAdmissionNote,modelName);
+                    aStrAdmissionNoteFacade.getOneList(medAdmissionNote,s.getModeId());
                 }
             }else if("危急值记录".equals(modelName)){
                 List<StrCrisisNote> medCrisisNote =fjtzdbConnHarp.getMedCrisisNote(this.sql(s));
                 if (medCrisisNote.size()>0){
-                    aStrCrisisNoteFacade.dealData(medCrisisNote.get(0),modelName);
-                }
-            }else if("查房记录".equals(modelName)){
-                List<StrWardRecord> medWardRecords =fjtzdbConnHarp.getMedWardRecord(this.sql(s));
-                if (medWardRecords.size()>0){
-                    aStrWardRecordFacade.dealData(medWardRecords.get(0),modelName);
+                    aStrCrisisNoteFacade.dealData(medCrisisNote.get(0),s.getModeId());
                 }
             }
             log.info(modelName+"---- 保存数据完成！");
@@ -385,7 +387,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()){
-                        aStrFirstRecordFacade.getOneList(map.get(key),modelName);
+                        aStrFirstRecordFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("输血后效果评价".equals(modelName)){
@@ -393,7 +395,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrBloodResultFacade.getOneList(map.get(key),modelName);
+                        aStrBloodResultFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("输血/血制品病程记录".equals(modelName)){
@@ -401,7 +403,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrBloodTransfusionFacade.getOneList(map.get(key),modelName);
+                        aStrBloodTransfusionFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("转入记录".equals(modelName)){
@@ -409,7 +411,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrTransferInNoteFacade.getOneList(map.get(key),modelName);
+                        aStrTransferInNoteFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("转出记录".equals(modelName)){
@@ -417,7 +419,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrTransferOutNoteFacade.getOneList(map.get(key),modelName);
+                        aStrTransferOutNoteFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("病危通知书".equals(modelName)){
@@ -425,7 +427,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrIllCriticallyFacade.getOneList(map.get(key),modelName);
+                        aStrIllCriticallyFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("病重通知书".equals(modelName)){
@@ -433,7 +435,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrIllSeriouslFacade.getOneList(map.get(key),modelName);
+                        aStrIllSeriouslFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("疑难病例讨论记录".equals(modelName)){
@@ -441,7 +443,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrDifficultCaseFacade.getOneList(map.get(key),modelName);
+                        aStrDifficultCaseFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("死亡记录".equals(modelName)){
@@ -449,7 +451,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrDeathNoteFacade.getOneList(map.get(key),modelName);
+                        aStrDeathNoteFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("死亡病例讨论记录".equals(modelName)){
@@ -457,7 +459,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrDeathDiscussionFacade.getOneList(map.get(key),modelName);
+                        aStrDeathDiscussionFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("术后首次病程及谈话记录".equals(modelName)){
@@ -465,7 +467,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrOperativeFirstRecord.getOneList(map.get(key),modelName);
+                        aStrOperativeFirstRecord.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("术前讨论、术前小结".equals(modelName)){
@@ -473,7 +475,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrPreoperativeDiscussionFacade.getOneList(map.get(key),modelName);
+                        aStrPreoperativeDiscussionFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("手术记录".equals(modelName)){
@@ -481,7 +483,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrOperativeNoteFacade.getOneList(map.get(key),modelName);
+                        aStrOperativeNoteFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("抢救记录".equals(modelName)){
@@ -489,7 +491,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrRescueNoteFacade.getOneList(map.get(key),modelName);
+                        aStrRescueNoteFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("出院小结".equals(modelName)){
@@ -497,7 +499,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrLeaveHospitalFacade.getOneList(map.get(key),modelName);
+                        aStrLeaveHospitalFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("会诊申请单".equals(modelName)){
@@ -505,7 +507,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrConsultationApplyFacade.getOneList(map.get(key),modelName);
+                        aStrConsultationApplyFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("会诊结果单".equals(modelName)){
@@ -513,7 +515,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrConsultationResultFacade.getOneList(map.get(key),modelName);
+                        aStrConsultationResultFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if("会诊单".equals(modelName)){
@@ -521,7 +523,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrConsultationNoteFacade.getOneList(map.get(key),modelName);
+                        aStrConsultationNoteFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             }else if ("会诊记录".equals(modelName)){
@@ -529,7 +531,7 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrConsultationRecordFacade.getOneList(map.get(key),modelName);
+                        aStrConsultationRecordFacade.getOneList(map.get(key),s.getModeId());
                     }
                 }
             } else if("阶段小结".equals(modelName)){
@@ -537,7 +539,15 @@ public class StructuralDataFacade {
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
                     for (String key:map.keySet()) {
-                        aStrPeriodConclusionFacade.getOneList(map.get(key),modelName);
+                        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)){
@@ -570,22 +580,24 @@ public class StructuralDataFacade {
                 if (doctorAdvice.size()>0){
                     aDoctorAdviceFacade.execute(doctorAdvice);
                 }
-            }else if ("入院登记".equals(modelName)){
-                List<BehospitalInfo> behospitalInfo =fjtzdbConnHarp.getBehospitalInfo(this.sqlOld(s));
-                if (behospitalInfo.size()>0){
+            }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)){
+
+//            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);
@@ -603,19 +615,12 @@ public class StructuralDataFacade {
             }else if("入院记录".equals(modelName)){
                 List<FJStrAdmissionNoteVo> medAdmissionNote =fjtzdbConnHarp.getMedAdmissionNote(this.sqlOld(s));
                 if (medAdmissionNote.size()>0){
-                    aStrAdmissionNoteFacade.getOneList(medAdmissionNote,modelName);
+                    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),modelName);
-                }
-            }else if("查房记录".equals(modelName)){
-                List<StrWardRecord> medWardRecords =fjtzdbConnHarp.getMedWardRecord(this.sqlOld(s));
-                if (medWardRecords.size()>0){
-                    for (StrWardRecord strWardRecord:medWardRecords){
-                        aStrWardRecordFacade.dealData(strWardRecord,modelName);
-                    }
+                    aStrCrisisNoteFacade.dealData(medCrisisNote.get(0),s.getModeId());
                 }
             }
             log.info(modelName+"---- 保存数据完成！");

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

@@ -0,0 +1,11 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class XMHIPMessageServerVo {
+
+    private String action;
+
+    private Object Message;
+}

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

@@ -50,12 +50,18 @@ public class DataController {
     private StructuralDataFacade structuralDataFacade;
     @Autowired
     private DeleteFlagFacade deleteFlagFacade;
-
+//
+//    @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
+//    @PostMapping("/sendDoctorInfos")
+//    @SysLogger("sendDoctorInfos")
+//    public RespDTO<List<ABasDoctorInfoDTO>> sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list){
+//        return aBasDoctorInfoFacade.executeDoctor(list);
+//    }
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
     @SysLogger("sendDoctorInfos")
-    public RespDTO<List<ABasDoctorInfoDTO>> sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list){
-        return aBasDoctorInfoFacade.executeDoctor(list);
+    public void sendDoctorInfos(){
+        aBasDoctorInfoFacade.executeDoctorXM();
     }
 
     @ApiOperation(value = "数据引擎-获取医院所有有效科室的基本信息")

src/main/resources/application-local.yml

@@ -1,5 +1,5 @@
 server:
-  port: 5858
+  port: 5859
   max-http-header-size: 10MB
 
 hystrix: