增加解析相关代码-结构化代码字段保存

src/main/java/com/diagbot/facade/QcClientFacade.java

@@ -56,6 +56,6 @@ public class QcClientFacade {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
 
-        return qcServiceClient.extract(uri, queryVo);
+        return qcServiceClient.analyseField(uri, queryVo);
     }
 }

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

@@ -38,7 +38,7 @@ public class AMedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
     }
 
     //入院记录
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedAdmissionNoteVO medAdmissionNoteVO=(AMedAdmissionNoteVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
             MedAdmissionNote medAdmissionNote=new MedAdmissionNote();
@@ -51,6 +51,7 @@ public class AMedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
             medAdmissionNote.setBirthday(DateUtil.parseDate(medAdmissionNoteVO.getBirthday()));//出生日期
             medAdmissionNote.setRecordDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecordDate()));//病历日期
 
+            medAdmissionNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medAdmissionNote)){
                 medAdmissionNote.setGmtCreate(new Date());//记录创建时间

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

@@ -35,7 +35,7 @@ public class AMedBloodResultFacade extends MedBloodResultServiceImpl {
         //Map<String, String> map=columnFacade.getColumn("medBloodResul");
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedBloodResultVO medBloodResultVO=(AMedBloodResultVO) MapUtil.mapToObject(entityMap, AMedBloodResultVO.class);
             MedBloodResult medBloodResult=new MedBloodResult();
@@ -45,6 +45,7 @@ public class AMedBloodResultFacade extends MedBloodResultServiceImpl {
             medBloodResult.setRecDate(DateUtil.parseDateTime(medBloodResultVO.getRecDate()));//记录时间
             medBloodResult.setRecordDate(DateUtil.parseDateTime(medBloodResultVO.getRecordDate()));//病历日期
 
+            medBloodResult.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medBloodResult)){
                 medBloodResult.setGmtCreate(new Date());//记录创建时间

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

@@ -37,7 +37,7 @@ public class AMedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedBloodTransfusionVO medBloodTransfusionVO=(AMedBloodTransfusionVO) MapUtil.mapToObject(entityMap, AMedBloodTransfusionVO.class);
             MedBloodTransfusion medBloodTransfusion=new MedBloodTransfusion();
@@ -49,6 +49,8 @@ public class AMedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
             medBloodTransfusion.setRecDate(DateUtil.parseDateTime(medBloodTransfusionVO.getRecDate()));//记录时间
             medBloodTransfusion.setRecordDate(DateUtil.parseDateTime(medBloodTransfusionVO.getRecordDate()));//病历日期
 
+            medBloodTransfusion.setWholeData(columnMap);
+
             //判断数据库中是否存在，不存在insert
             if(isExist(medBloodTransfusion)){
                 medBloodTransfusion.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedConsultationApplyFacade extends MedConsultationApplyServiceImpl
     }
 
     //会诊申请单
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedConsultationApplyVO medConsultationApplyVO=(AMedConsultationApplyVO) MapUtil.mapToObject(entityMap, AMedConsultationApplyVO.class);
             MedConsultationApply medConsultationApply=new MedConsultationApply();
@@ -51,7 +51,7 @@ public class AMedConsultationApplyFacade extends MedConsultationApplyServiceImpl
             medConsultationApply.setRecordDate(DateUtil.parseDateTime(medConsultationApplyVO.getRecordDate()));//病历日期
             medConsultationApply.setApplyDate(DateUtil.parseDateTime(medConsultationApplyVO.getApplyDate()));//申请日期
             medConsultationApply.setConsultationDate(DateUtil.parseDateTime(medConsultationApplyVO.getConsultationDate()));//会诊时间
-
+            medConsultationApply.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medConsultationApply)){
                 medConsultationApply.setGmtCreate(new Date());//记录创建时间

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

@@ -3,13 +3,11 @@ package com.diagbot.facade.data;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.MedAdmissionNote;
 import com.diagbot.entity.MedConsultationNote;
 import com.diagbot.service.impl.MedConsultationNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedAdmissionNoteVO;
 import com.diagbot.vo.data.AMedConsultationNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +39,7 @@ public class AMedConsultationNoteFacade extends MedConsultationNoteServiceImpl {
     }
 
     //会诊单（申请和结果）
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedConsultationNoteVO medConsultationNoteVO=(AMedConsultationNoteVO) MapUtil.mapToObject(entityMap, AMedConsultationNoteVO.class);
             MedConsultationNote medConsultationNote=new MedConsultationNote();
@@ -55,6 +53,7 @@ public class AMedConsultationNoteFacade extends MedConsultationNoteServiceImpl {
             medConsultationNote.setRecordDate(DateUtil.parseDateTime(medConsultationNoteVO.getRecordDate()));//病历日期
             medConsultationNote.setConsultationDate(DateUtil.parseDateTime(medConsultationNoteVO.getConsultationDate()));//会诊时间
 
+            medConsultationNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medConsultationNote)){
                 medConsultationNote.setGmtCreate(new Date());//记录创建时间

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

@@ -39,7 +39,7 @@ public class AMedConsultationResultFacade extends MedConsultationResultServiceIm
     }
 
     //会诊结果单
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedConsultationResultVO medConsultationResultVO=(AMedConsultationResultVO) MapUtil.mapToObject(entityMap, AMedConsultationResultVO.class);
             MedConsultationResult medConsultationResult=new MedConsultationResult();
@@ -53,7 +53,7 @@ public class AMedConsultationResultFacade extends MedConsultationResultServiceIm
             medConsultationResult.setRecordDate(DateUtil.parseDateTime(medConsultationResultVO.getRecordDate()));//病历日期
             medConsultationResult.setConsultationArriveDate(DateUtil.parseDateTime(medConsultationResultVO.getConsultationArriveDate()));//会诊到达时间
 
-
+            medConsultationResult.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medConsultationResult)){
                 medConsultationResult.setGmtCreate(new Date());//记录创建时间

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

@@ -35,7 +35,7 @@ public class AMedCrisisNoteFacade extends MedCrisisNoteServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedCrisisNoteVO medCrisisNoteVO=(AMedCrisisNoteVO) MapUtil.mapToObject(entityMap, AMedCrisisNoteVO.class);
             MedCrisisNote medCrisisNote=new MedCrisisNote();
@@ -48,6 +48,7 @@ public class AMedCrisisNoteFacade extends MedCrisisNoteServiceImpl {
             medCrisisNote.setAuditDate(DateUtil.parseDate(medCrisisNoteVO.getAuditDate()));//结束时间
             medCrisisNote.setRecordDate(DateUtil.parseDateTime(medCrisisNoteVO.getRecordDate()));//病历日期
 
+            medCrisisNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medCrisisNote)){
                 medCrisisNote.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedDeathDiscussionFacade extends MedDeathDiscussionServiceImpl {
     }
 
     //死亡病例讨论记录
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedDeathDiscussionVO medDeathDiscussionVO=(AMedDeathDiscussionVO) MapUtil.mapToObject(entityMap, AMedDeathDiscussionVO.class);
             MedDeathDiscussion medDeathDiscussion=new MedDeathDiscussion();
@@ -51,6 +51,7 @@ public class AMedDeathDiscussionFacade extends MedDeathDiscussionServiceImpl {
             medDeathDiscussion.setDiscussDate(DateUtil.parseDate(medDeathDiscussionVO.getDiscussDate()));//讨论时间
             medDeathDiscussion.setRecordDate(DateUtil.parseDateTime(medDeathDiscussionVO.getRecordDate()));//病历日期
 
+            medDeathDiscussion.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medDeathDiscussion)){
                 medDeathDiscussion.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedDeathNoteFacade extends MedDeathNoteServiceImpl {
     }
 
     //死亡记录
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedDeathNoteVO medDeathNoteVO=(AMedDeathNoteVO) MapUtil.mapToObject(entityMap, AMedDeathNoteVO.class);
             MedDeathNote medDeathNote=new MedDeathNote();
@@ -51,6 +51,7 @@ public class AMedDeathNoteFacade extends MedDeathNoteServiceImpl {
             medDeathNote.setDeathDate(DateUtil.parseDate(medDeathNoteVO.getDeathDate()));//死亡日期
             medDeathNote.setRecordDate(DateUtil.parseDateTime(medDeathNoteVO.getRecordDate()));//病历日期
 
+            medDeathNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medDeathNote)){
                 medDeathNote.setGmtCreate(new Date());//记录创建时间

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

@@ -37,7 +37,7 @@ public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedDifficultCaseVO medDifficultVO=(AMedDifficultCaseVO) MapUtil.mapToObject(entityMap, AMedDifficultCaseVO.class);
             MedDifficultCase medDifficult=new MedDifficultCase();
@@ -48,6 +48,7 @@ public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
             medDifficult.setDiscussDate(DateUtil.parseDateTime(medDifficultVO.getDiscussDate()));
             medDifficult.setRecordDate(DateUtil.parseDateTime(medDifficultVO.getRecordDate()));//病历日期
 
+            medDifficult.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medDifficult)){
                 medDifficult.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedFirstRecordVO medFirstRecordVO=(AMedFirstRecordVO) MapUtil.mapToObject(entityMap, AMedFirstRecordVO.class);
             MedFirstRecord medFirstRecord=new MedFirstRecord();
@@ -49,6 +49,7 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
             medFirstRecord.setRecDate(DateUtil.parseDateTime(medFirstRecordVO.getRecDate()));//记录时间
             medFirstRecord.setRecordDate(DateUtil.parseDateTime(medFirstRecordVO.getRecordDate()));//病历日期
 
+            medFirstRecord.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medFirstRecord)){
                 medFirstRecord.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedIllCriticallyVO medIllCriticallyVO=(AMedIllCriticallyVO) MapUtil.mapToObject(entityMap, AMedIllCriticallyVO.class);
             MedIllCritically medIllCritically=new MedIllCritically();
@@ -48,6 +48,7 @@ public class AMedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
             medIllCritically.setDoctorSignDate(DateUtil.parseDateTime(medIllCriticallyVO.getDoctorSignDate()));//审核时间
             medIllCritically.setRecordDate(DateUtil.parseDateTime(medIllCriticallyVO.getRecordDate()));//病历日期
 
+            medIllCritically.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medIllCritically)){
                 medIllCritically.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedIllSeriouslFacade extends MedIllSeriouslServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedIllSeriouslVO medIllSeriouslVO=(AMedIllSeriouslVO) MapUtil.mapToObject(entityMap, AMedIllSeriouslVO.class);
             MedIllSeriousl medIllSeriousl=new MedIllSeriousl();
@@ -48,6 +48,7 @@ public class AMedIllSeriouslFacade extends MedIllSeriouslServiceImpl {
             medIllSeriousl.setDoctorSignDate(DateUtil.parseDateTime(medIllSeriouslVO.getDoctorSignDate()));//审核时间
             medIllSeriousl.setRecordDate(DateUtil.parseDateTime(medIllSeriouslVO.getRecordDate()));//病历日期
 
+            medIllSeriousl.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medIllSeriousl)){
                 medIllSeriousl.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedLeaveHospitalFacade extends MedLeaveHospitalServiceImpl {
     }
 
     //危急值记录
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedLeaveHospitalVO medLeaveHospitalVO=(AMedLeaveHospitalVO) MapUtil.mapToObject(entityMap, AMedLeaveHospitalVO.class);
             MedLeaveHospital medLeaveHospital=new MedLeaveHospital();
@@ -51,6 +51,7 @@ public class AMedLeaveHospitalFacade extends MedLeaveHospitalServiceImpl {
             medLeaveHospital.setLeaveHospitalDate(DateUtil.parseDateTime(medLeaveHospitalVO.getLeaveHospitalDate()));//出院时间
             medLeaveHospital.setRecordDate(DateUtil.parseDateTime(medLeaveHospitalVO.getRecordDate()));//病历日期
 
+            medLeaveHospital.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medLeaveHospital)){
                 medLeaveHospital.setGmtCreate(new Date());//记录创建时间

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

@@ -39,7 +39,7 @@ public class AMedOperativeFirstRecord extends MedOperativeFirstRecordServiceImpl
     }
 
     //术后首程
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedOperativeFirstRecordVO medOperativeFirstRecordVO=(AMedOperativeFirstRecordVO) MapUtil.mapToObject(entityMap, AMedOperativeFirstRecordVO.class);
             MedOperativeFirstRecord medOperativeFirstRecord=new MedOperativeFirstRecord();
@@ -53,6 +53,7 @@ public class AMedOperativeFirstRecord extends MedOperativeFirstRecordServiceImpl
             medOperativeFirstRecord.setEndTime(DateUtil.parseDate(medOperativeFirstRecordVO.getEndTime()));//结束时间
             medOperativeFirstRecord.setRecordDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getRecordDate()));//病历日期
 
+            medOperativeFirstRecord.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medOperativeFirstRecord)){
                 medOperativeFirstRecord.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedOperativeNoteFacade extends MedOperativeNoteServiceImpl {
     }
 
     //手术记录
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedOperativeNoteVO medOperativeNoteVO=(AMedOperativeNoteVO) MapUtil.mapToObject(entityMap, AMedOperativeNoteVO.class);
             MedOperativeNote medOperativeNote=new MedOperativeNote();
@@ -52,6 +52,7 @@ public class AMedOperativeNoteFacade extends MedOperativeNoteServiceImpl {
             medOperativeNote.setEndTime(DateUtil.parseDate(medOperativeNoteVO.getEndTime()));//结束时间
             medOperativeNote.setRecordDate(DateUtil.parseDateTime(medOperativeNoteVO.getRecordDate()));//病历日期
 
+            medOperativeNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medOperativeNote)){
                 medOperativeNote.setGmtCreate(new Date());//记录创建时间

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

@@ -39,7 +39,7 @@ public class AMedPeriodConclusionFacade extends MedPeriodConclusionServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedPeriodConclusionVO medPeriodConclusionVO=(AMedPeriodConclusionVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
             MedPeriodConclusion medPeriodConclusion=new MedPeriodConclusion();
@@ -50,6 +50,7 @@ public class AMedPeriodConclusionFacade extends MedPeriodConclusionServiceImpl {
             medPeriodConclusion.setRecDate(DateUtil.parseDateTime(medPeriodConclusionVO.getRecDate()));//记录时间
             medPeriodConclusion.setRecordDate(DateUtil.parseDateTime(medPeriodConclusionVO.getRecordDate()));//病历日期
 
+            medPeriodConclusion.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medPeriodConclusion)){
                 medPeriodConclusion.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedPreoperativeDiscussionFacade extends MedPreoperativeDiscussionS
     }
 
     //入院记录
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedPreoperativeDiscussionVO medPreoperativeDiscussionVO=(AMedPreoperativeDiscussionVO) MapUtil.mapToObject(entityMap, AMedPreoperativeDiscussionVO.class);
             MedPreoperativeDiscussion medPreoperativeDiscussion=new MedPreoperativeDiscussion();
@@ -50,6 +50,7 @@ public class AMedPreoperativeDiscussionFacade extends MedPreoperativeDiscussionS
             medPreoperativeDiscussion.setDiscussTime(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getDiscussTime()));//讨论时间
             medPreoperativeDiscussion.setRecordDate(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getRecordDate()));//病历日期
 
+            medPreoperativeDiscussion.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medPreoperativeDiscussion)){
                 medPreoperativeDiscussion.setGmtCreate(new Date());//记录创建时间

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

@@ -37,7 +37,7 @@ public class AMedRescueNoteFacade extends MedRescueNoteServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedRescueNoteVO medRescueNoteVO=(AMedRescueNoteVO) MapUtil.mapToObject(entityMap, AMedRescueNoteVO.class);
             MedRescueNote medRescueNote=new MedRescueNote();
@@ -50,6 +50,7 @@ public class AMedRescueNoteFacade extends MedRescueNoteServiceImpl {
             medRescueNote.setEndTime(DateUtil.parseDate(medRescueNoteVO.getEndTime()));//结束时间
             medRescueNote.setRecordDate(DateUtil.parseDateTime(medRescueNoteVO.getRecordDate()));//病历日期
 
+            medRescueNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medRescueNote)){
                 medRescueNote.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedTransferInNoteFacade extends MedTransferInNoteServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedTransferInNoteVO medTransferInNoteVO=(AMedTransferInNoteVO) MapUtil.mapToObject(entityMap, AMedTransferInNoteVO.class);
             MedTransferInNote medTransferInNote=new MedTransferInNote();
@@ -49,6 +49,7 @@ public class AMedTransferInNoteFacade extends MedTransferInNoteServiceImpl {
             medTransferInNote.setRecDate(DateUtil.parseDateTime(medTransferInNoteVO.getRecDate()));//记录时间
             medTransferInNote.setRecordDate(DateUtil.parseDateTime(medTransferInNoteVO.getRecordDate()));//病历日期
 
+            medTransferInNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medTransferInNote)){
                 medTransferInNote.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedTransferOutNoteFacade extends MedTransferOutNoteServiceImpl {
         }
     }
 
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedTransferOutNoteVO medTransferOutNoteVO=(AMedTransferOutNoteVO) MapUtil.mapToObject(entityMap, AMedTransferOutNoteVO.class);
             MedTransferOutNote medTransferOutNote=new MedTransferOutNote();
@@ -49,6 +49,7 @@ public class AMedTransferOutNoteFacade extends MedTransferOutNoteServiceImpl {
             medTransferOutNote.setRecDate(DateUtil.parseDateTime(medTransferOutNoteVO.getRecDate()));//记录时间
             medTransferOutNote.setRecordDate(DateUtil.parseDateTime(medTransferOutNoteVO.getRecordDate()));//病历日期
 
+            medTransferOutNote.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medTransferOutNote)){
                 medTransferOutNote.setGmtCreate(new Date());//记录创建时间

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

@@ -38,7 +38,7 @@ public class AMedWardRecordFacade extends MedWardRecordServiceImpl {
     }
 
     //查房记录
-    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         try {
             AMedWardRecordVO medWardRecordVO=(AMedWardRecordVO) MapUtil.mapToObject(entityMap, AMedWardRecordVO.class);
             MedWardRecord medWardRecord=new MedWardRecord();
@@ -50,6 +50,7 @@ public class AMedWardRecordFacade extends MedWardRecordServiceImpl {
             medWardRecord.setWardDate(DateUtil.parseDateTime(medWardRecordVO.getWardDate()));//查房日期
             medWardRecord.setRecordDate(DateUtil.parseDateTime(medWardRecordVO.getRecordDate()));//病历日期
 
+            medWardRecord.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
             if(isExist(medWardRecord)){
                 medWardRecord.setGmtCreate(new Date());//记录创建时间

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

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.diagbot.dto.OutputInfo;
 import com.diagbot.dto.Response;
 import com.diagbot.enums.CacheKeyEnum;
@@ -35,6 +36,7 @@ public class ColumnFacade extends ColumnServiceImpl {
                 pageData.forEach((key,value)->{
                     List<Map<String, Object>> listMap=(List<Map<String,Object>>)resp.getData().getPageData().get(key);
                     Map<String, String> columnMap=this.getColumn(CacheKeyEnum.getName(key));
+
                     Map<String, Object> entityMap=new HashMap<String, Object>();
                     listMap.forEach(s->{
                         columnMap.forEach((k, v) -> {
@@ -42,7 +44,7 @@ public class ColumnFacade extends ColumnServiceImpl {
                         });
                     });
                     //数据解析
-                    analysisData(key,entityMap,Long.valueOf(queryVo.getHospitalId()));
+                    analysisData(key,entityMap,Long.valueOf(queryVo.getHospitalId()),JSON.toJSONString(listMap));
                 });
             }
         }catch (Exception e){
@@ -57,52 +59,52 @@ public class ColumnFacade extends ColumnServiceImpl {
      * @param entityMap
      * @param hospitalId
      */
-    private void analysisData(String modelName,Map<String, Object> entityMap,Long hospitalId){
+    private void analysisData(String modelName,Map<String, Object> entityMap,Long hospitalId,String columnMap){
         try {
             if("入院记录".equals(modelName)){
-                aMedAdmissionNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedAdmissionNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("首次病程录".equals(modelName)){
-                aMedFirstRecordFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("输血后效果评价".equals(modelName)){
-                aMedBloodResultFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedBloodResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("输血/血制品病程记录".equals(modelName)){
-                aMedBloodTransfusionFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedBloodTransfusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("转入记录".equals(modelName)){
-                aMedTransferInNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedTransferInNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("转出记录".equals(modelName)){
-                aMedTransferOutNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedTransferOutNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("病危通知书".equals(modelName)){
-                aMedIllCriticallyFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedIllCriticallyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("病重通知书".equals(modelName)){
-                aMedIllSeriouslFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedIllSeriouslFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("疑难病例讨论记录".equals(modelName)){
-                aMedDifficultCaseFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedDifficultCaseFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("死亡记录".equals(modelName)){
-                aMedDeathNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedDeathNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("死亡病例讨论记录".equals(modelName)){
-                aMedDeathDiscussionFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedDeathDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("查房记录".equals(modelName)){
-                aMedWardRecordFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedWardRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("术后首次病程及谈话记录".equals(modelName)){
-                aMedOperativeFirstRecord.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedOperativeFirstRecord.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("术前讨论、术前小结".equals(modelName)){
-                aMedPreoperativeDiscussionFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedPreoperativeDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("手术记录".equals(modelName)){
-                aMedOperativeNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedOperativeNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("抢救记录".equals(modelName)){
-                aMedRescueNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedRescueNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("危急值记录".equals(modelName)){
-                aMedCrisisNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedCrisisNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("出院小结".equals(modelName)){
-                aMedLeaveHospitalFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedLeaveHospitalFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("会诊申请单".equals(modelName)){
-                aMedConsultationApplyFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedConsultationApplyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("会诊结果单".equals(modelName)){
-                aMedConsultationResultFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedConsultationResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("会诊单".equals(modelName)){
-                aMedConsultationNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedConsultationNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("阶段小结".equals(modelName)){
-                aMedPeriodConclusionFacade.dealData(entityMap,Long.valueOf(hospitalId));
+                aMedPeriodConclusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }
             log.info(modelName+"---- 解析完成！");
         }catch (Exception e){

src/main/resources/application-local.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.121:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: teamback
-      password: goTulmLeon
+      url: jdbc:mysql://127.0.0.1:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5