增加解析相关代码

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

@@ -5,10 +5,15 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.MedAdmissionNote;
 import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedAdmissionNoteVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +37,38 @@ public class AMedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
         }
     }
 
+    //入院记录
+    public void medAdmissionNoteData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedAdmissionNoteVO medAdmissionNoteVO=(AMedAdmissionNoteVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
+            MedAdmissionNote medAdmissionNote=new MedAdmissionNote();
+            BeanUtils.copyProperties(medAdmissionNoteVO,medAdmissionNote);
+            medAdmissionNote.setHospitalId(hospitalId);//医院编码
+
+            medAdmissionNote.setAuditDate(DateUtil.parseDateTime(medAdmissionNoteVO.getAuditDate()));//审核时间
+            medAdmissionNote.setRecDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecDate()));//记录时间
+            medAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(medAdmissionNoteVO.getBehospitalDate()));//入院日期
+            medAdmissionNote.setBirthday(DateUtil.parseDate(medAdmissionNoteVO.getBirthday()));//出生日期
+            medAdmissionNote.setRecordDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medAdmissionNote)){
+                medAdmissionNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medAdmissionNote);
+            }else{
+                medAdmissionNote.setGmtModified(new Date());//记录修改时间
+                this.update(medAdmissionNote,new QueryWrapper<MedAdmissionNote>()
+                        .eq("rec_id", medAdmissionNote.getRecId())
+                        .eq("hospital_id", medAdmissionNote.getHospitalId())
+                        .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
     public Boolean isExist(MedAdmissionNote medAdmissionNote){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<MedAdmissionNote>()

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

@@ -1,28 +1,21 @@
 package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.OutputInfo;
 import com.diagbot.dto.Response;
-import com.diagbot.entity.MedAdmissionNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.BasHospitalInfoFacade;
 import com.diagbot.facade.QcClientFacade;
 import com.diagbot.service.impl.ColumnServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.MapUtil;
 import com.diagbot.vo.MedrecVo;
 import com.diagbot.vo.QueryVo;
 import com.diagbot.vo.data.AColumnContentVO;
-import com.diagbot.vo.data.AMedAdmissionNoteVO;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -113,7 +106,7 @@ public class ColumnFacade extends ColumnServiceImpl {
             });
             //数据解析
             if("入院记录".equals(modelName)){
-                medAdmissionNoteData(entityMap,Long.valueOf(hospitalId));
+                aMedAdmissionNoteFacade.medAdmissionNoteData(entityMap,Long.valueOf(hospitalId));
             }
 
             log.info(modelName+"---- 解析完成！");
@@ -123,35 +116,5 @@ public class ColumnFacade extends ColumnServiceImpl {
 
     }
 
-    //入院记录
-    private void medAdmissionNoteData(Map<String, Object> entityMap,Long hospitalId){
-        try {
-            AMedAdmissionNoteVO medAdmissionNoteVO=(AMedAdmissionNoteVO)MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
-            MedAdmissionNote medAdmissionNote=new MedAdmissionNote();
-            BeanUtils.copyProperties(medAdmissionNoteVO,medAdmissionNote);
-            medAdmissionNote.setHospitalId(hospitalId);//医院编码
-
-            medAdmissionNote.setAuditDate(DateUtil.parseDateTime(medAdmissionNoteVO.getAuditDate()));//审核时间
-            medAdmissionNote.setRecDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecDate()));//记录时间
-            medAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(medAdmissionNoteVO.getBehospitalDate()));//入院日期
-            medAdmissionNote.setBirthday(DateUtil.parseDate(medAdmissionNoteVO.getBirthday()));//出生日期
-            medAdmissionNote.setRecordDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecordDate()));//病历日期
-
-            //判断数据库中是否存在，不存在insert
-            if(aMedAdmissionNoteFacade.isExist(medAdmissionNote)){
-                medAdmissionNote.setGmtCreate(new Date());//记录创建时间
-                aMedAdmissionNoteFacade.save(medAdmissionNote);
-            }else{
-                medAdmissionNote.setGmtModified(new Date());//记录修改时间
-                aMedAdmissionNoteFacade.update(medAdmissionNote,new QueryWrapper<MedAdmissionNote>()
-                        .eq("rec_id", medAdmissionNote.getRecId())
-                        .eq("hospital_id", medAdmissionNote.getHospitalId())
-                        .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
-            }
 
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-        }
-
-    }
 }

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

@@ -34,6 +34,8 @@ public class ColumnCacheUtil implements ApplicationRunner {
 
             aMedAdmissionNoteFacade.getColumnZhAndCh();//入院记录
 
+
+
             log.info("列名和注释缓存初始化完成！");
         }catch (Exception e){
             log.error(e.getMessage(),e);