增加解析相关代码

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -68,7 +68,7 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 出生日期
      */
-    private LocalDateTime birthday;
+    private Date birthday;
 
     /**
      * 婚姻状况
@@ -123,7 +123,7 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 入院日期
      */
-    private LocalDateTime behospitalDate;
+    private Date behospitalDate;
 
     /**
      * 病史陈述者
@@ -228,7 +228,7 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -238,7 +238,7 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 体温
@@ -298,12 +298,12 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -371,11 +371,11 @@ public class MedAdmissionNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
     public String getRecTitle() {
@@ -385,11 +385,11 @@ public class MedAdmissionNote implements Serializable {
     public void setRecTitle(String recTitle) {
         this.recTitle = recTitle;
     }
-    public LocalDateTime getBirthday() {
+    public Date getBirthday() {
         return birthday;
     }
 
-    public void setBirthday(LocalDateTime birthday) {
+    public void setBirthday(Date birthday) {
         this.birthday = birthday;
     }
     public String getMarriage() {
@@ -462,11 +462,11 @@ public class MedAdmissionNote implements Serializable {
     public void setPregnantNum(String pregnantNum) {
         this.pregnantNum = pregnantNum;
     }
-    public LocalDateTime getBehospitalDate() {
+    public Date getBehospitalDate() {
         return behospitalDate;
     }
 
-    public void setBehospitalDate(LocalDateTime behospitalDate) {
+    public void setBehospitalDate(Date behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
     public String getHistoryTeller() {
@@ -609,11 +609,11 @@ public class MedAdmissionNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -623,11 +623,11 @@ public class MedAdmissionNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getTemperature() {
@@ -707,18 +707,18 @@ public class MedAdmissionNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

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

@@ -1,17 +1,17 @@
 package com.diagbot.enums;
 
-import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
-public enum ModeIdFacadeEnum implements KeyedNamed {
+public enum CacheKeyEnum implements KeyedString {
 
-    BEHOSPITAL_INFO(1, "aMedAdmissionNoteFacade"),
+    BEHOSPITAL_INFO("入院记录", "medAdmissionNote"),
+    CONSULTATION_NOTE("会诊单", "medConsultationNote");
+    /*
     FIRST_RECORD(2, "aMedFirstRecordFacade"),
     DEATH_DISCUSSION(3, "死亡病例讨论记录"),
     WARD_RECORD(4, "查房记录"),
     LEAVE_HOSPITAL(5, "出院小结"),
     HOME_PAGE(6, "病案首页"),
-    /*
     CONSULTATION_NOTE1(7, "会诊记录"),
             (8, "医嘱信息"),
             (9, "交接班记录"),
@@ -35,11 +35,8 @@ public enum ModeIdFacadeEnum implements KeyedNamed {
     TRANSFER_OUT_NOTE(27, "转出记录"),
     PERIOD_CONCLUSION(28, "阶段小结"),
     ILL_SERIOUSL(29, "病重通知书"),
-    */
-
     CONSULTATION_APPLY(30, "aMedConsultationApplyFacade"),
     CONSULTATION_RESULT(31, "aMedConsultationResultFacade"),
-    /*
     DATA_MODEL(32, "输血后效果评价"),
     DATA_MODEL(33, "专科交接单"),
     DATA_MODEL(34, "转科记录"),
@@ -55,20 +52,20 @@ public enum ModeIdFacadeEnum implements KeyedNamed {
     LIS_INFO(58, "检验信息"),
     LIS_INFO(59, "有创操作"),
     */
-    CONSULTATION_NOTE(60, "aMedConsultationNoteFacade");
+
     @Setter
-    private int key;
+    private String key;
 
     @Setter
     private String name;
 
-    ModeIdFacadeEnum(int key, String name) {
+    CacheKeyEnum(String key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ModeIdFacadeEnum getEnum(int key) {
-        for (ModeIdFacadeEnum item : ModeIdFacadeEnum.values()) {
+    public static CacheKeyEnum getEnum(String key) {
+        for (CacheKeyEnum item : CacheKeyEnum.values()) {
             if (item.key == key) {
                 return item;
             }
@@ -76,13 +73,13 @@ public enum ModeIdFacadeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(int key) {
-        ModeIdFacadeEnum item = getEnum(key);
+    public static String getName(String key) {
+        CacheKeyEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
 
     @Override
-    public int getKey() {
+    public String getKey() {
         return key;
     }
 

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

@@ -0,0 +1,7 @@
+package com.diagbot.enums;
+
+public interface KeyedString {
+    String getKey();
+
+    String getName();
+}

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

@@ -1,7 +1,9 @@
 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.service.impl.MedAdmissionNoteServiceImpl;
 import com.diagbot.util.EntityUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +26,22 @@ public class AMedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
         Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
         Boolean flag=columnFacade.createColumn(columnMap,"medAdmissionNote");
 
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        //Map<String, String> map=columnFacade.getColumn("medAdmissionNote");
         if(!flag){
             return;
         }
     }
+
+    public Boolean isExist(MedAdmissionNote medAdmissionNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedAdmissionNote>()
+                .eq("rec_id", medAdmissionNote.getRecId())
+                .eq("hospital_id", medAdmissionNote.getHospitalId())
+                .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
 }

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

@@ -1,18 +1,28 @@
 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.MedicalRecord;
+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;
@@ -30,11 +40,15 @@ public class ColumnFacade extends ColumnServiceImpl {
     @Autowired
     private AMedFirstRecordFacade aMedFirstRecordFacade;
 
+    @Autowired
+    private BasHospitalInfoFacade basHospitalInfoFacade;
+
+
     /**
      * 解析
      * @param modeId
      */
-    public void analyseRec(String hospitalId, Long modeId, MedicalRecord medicalRecord){
+    public void analyseRec(String hospitalId, Long modeId, List<AColumnContentVO> aColumnContentVO){
         try {
             String modelName= ModeIdEnum.getName(Integer.parseInt(modeId.toString()));
             QueryVo queryVo=new QueryVo();
@@ -42,32 +56,102 @@ public class ColumnFacade extends ColumnServiceImpl {
             MedrecVo medrecVo=new MedrecVo();
             medrecVo.setTitle(modelName);
             Map<String, Object> map=new HashMap<String, Object>();
-            map.put("content",medicalRecord);
+            List content=Lists.newArrayList();
+            aColumnContentVO.stream().forEach(s->{
+                content.add(s);
+            });
+
+            map.put("content",content);
             medrecVo.setContent(map);
 
             list.add(medrecVo);
             queryVo.setHospitalId(hospitalId);
+            queryVo.setCid(basHospitalInfoFacade.getHosCode(Long.valueOf(hospitalId)));
             queryVo.setMedrec(list);
 
             Response<OutputInfo> resp=qcClientFacade.analyseField(queryVo);
-            if(resp!=null && resp.getData()!=null && resp.getData().getPageData().size()>0){
-                Map<String,Object> pageData=resp.getData().getPageData();
-
+            String paramIn= JSON.toJSONString(queryVo);
+            String paramOut="{" +
+                    "        \"result\": {}," +
+                    "        \"pageData\": {" +
+                    "            \"入院记录\": [" +
+                    "                {" +
+                    "                    \"职业\": \"农民 \"," +
+                    "                    \"联系人\": \"儿子 13958306196\"," +
+                    "                    \"联系地址\": \"浙江省宁波市北仑区 \"," +
+                    "                    \"出院诊断\": \"前列腺癌\"," +
+                    "                    \"出院时间\": \"2020-06-07 13:01\"," +
+                    "                    \"主诉\": \"发现前列腺癌4年余，要求内分泌治疗\"," +
+                    "                    \"入院诊断\": \"前列腺癌\"," +
+                    "                    \"出生地\": \"浙江省宁波市北仑区\"," +
+                    "                    \"辅助检查\": \"年月日本院暂缺\"," +
+                    "                    \"婚姻\": \"已婚\"," +
+                    "                    \"其他\": \"无\"," +
+                    "                    \"入院情况\": \"发现前列腺癌4年余，要求内分泌治疗\"," +
+                    "                    \"专科检查\": \"双肾区未及肿块，无压痛，双肾区无叩击痛，双侧输尿管走行区无压痛，膀胱未及充盈，未及肿块，区域淋巴结未及肿大。生殖器发育正常，尿道外口无红肿及脓血性分泌物，双侧睾丸附睾及精索未见异常。肛诊前列腺：5.5×5.0cm大小，质硬，无压痛，表面光滑，中央沟消失，边界清楚，未及明显结节，指套无红染。\"," +
+                    "                    \"诊疗经过\": \"1、泌尿外科护理常规，普食，II级护理，2.完善相关检查，如血常规、肝肾功能、血PSA等检查，排外全身疾病及禁忌后予康士德联合戈舍瑞林行内分泌，并给予唑来磷酸针抗骨转移治疗。\"," +
+                    "                    \"民族\": \"汉族\"," +
+                    "                    \"病史陈述者\": \"患者本人及亲属\"," +
+                    "                    \"入院日期\": \"2020-06-07\"," +
+                    "                    \"联系电话\": \"13958306196\"," +
+                    "                    \"mode_id\": \"369\"," +
+                    "                    \"出生日期\": \"1932-04-04\"," +
+                    "                    \"出院情况\": \"患者下腹部及腰部酸痛，无发热、畏寒，无胸闷、气促，无恶心、呕吐等不适，查体无殊。\"," +
+                    "                    \"出院医嘱\": \"1.注意事项：多饮水，多休息；定期复查，28天返院复查并行内分泌治疗。联系电话：联系电话2.随访计划：28天返院复查并行内分泌治疗3.出院带药：！(10mg)盐酸羟考酮缓释片(奥施康(/10mg*10片)/1片 一日2次 口服。\"" +
+                    "                }" +
+                    "            ]" +
+                    "        }" +
+                    "    }";
+            Map<String, Map<String, Object>> paramOutMap=(Map<String, Map<String, Object>>)JSON.parse(paramOut);
+            List<Map<String,Object>> listMap =(List<Map<String,Object>>)paramOutMap.get("pageData").get(modelName);
+            Map<String, Object> entityMap=new HashMap<String, Object>();
+            Map<String, String> columnMap=this.getColumn(CacheKeyEnum.getName(modelName));
+            listMap.forEach(s->{
+                columnMap.forEach((key, value) -> {
+                    entityMap.put(value,s.get(key));
+                });
+            });
+            //数据解析
+            if("入院记录".equals(modelName)){
+                medAdmissionNoteData(entityMap,Long.valueOf(hospitalId));
             }
 
-            /*
-            String voName=ModeIdFacadeEnum.getName(Integer.parseInt(modeId.toString()));
-            MedFirstRecord
-
-            aMedFirstRecordFacade.save();
-            */
-
             log.info(modelName+"---- 解析完成！");
         }catch (Exception e){
             log.error(e.getMessage(),e);
         }
 
+    }
+
+    //入院记录
+    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

@@ -1,5 +1,6 @@
 package com.diagbot.util;
 
+import com.diagbot.facade.data.AMedAdmissionNoteFacade;
 import com.diagbot.facade.data.AMedBloodResultFacade;
 import com.diagbot.facade.data.AMedBloodTransfusionFacade;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +22,9 @@ public class ColumnCacheUtil implements ApplicationRunner {
     @Autowired
     private AMedBloodTransfusionFacade aMedBloodTransfusionFacade;
 
+    @Autowired
+    private AMedAdmissionNoteFacade aMedAdmissionNoteFacade;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
         try {
@@ -28,6 +32,8 @@ public class ColumnCacheUtil implements ApplicationRunner {
 
             aMedBloodTransfusionFacade.getColumnZhAndCh();
 
+            aMedAdmissionNoteFacade.getColumnZhAndCh();//入院记录
+
             log.info("列名和注释缓存初始化完成！");
         }catch (Exception e){
             log.error(e.getMessage(),e);

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

@@ -0,0 +1,15 @@
+package com.diagbot.vo.data;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AColumnContentVO {
+    private String standModelName;
+    private String recTitle;
+    private String recId;
+    private String recTypeId;
+    private Long modeId;
+    private String xmlText;
+}

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

@@ -1,11 +1,14 @@
 package com.diagbot.vo.data;
 
-import com.diagbot.entity.MedicalRecord;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+import java.util.List;
+
+@Getter
+@Setter
 public class AColumnVO {
     private String hospitalId;
     private Long modeId;
-    private MedicalRecord medicalRecord;
+    private List<AColumnContentVO> content;
 }

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

@@ -0,0 +1,307 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedAdmissionNoteVO {
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 婚姻状况
+     */
+    private String marriage;
+
+    /**
+     * 职业
+     */
+    private String jobType;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 工作单位
+     */
+    private String workplace;
+
+    /**
+     * 户口地址
+     */
+    private String registerAddress;
+
+    /**
+     * 出生地
+     */
+    private String bornAddress;
+
+    /**
+     * 预产期
+     */
+    private String expectDate;
+
+    /**
+     * 末次月经
+     */
+    private String lastMenstrual;
+
+    /**
+     * 孕/产次
+     */
+    private String pregnantNum;
+
+    /**
+     * 入院日期
+     */
+    private String behospitalDate;
+
+    /**
+     * 病史陈述者
+     */
+    private String historyTeller;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 现病史
+     */
+    private String present;
+
+    /**
+     * 既往史
+     */
+    private String pastHistory;
+
+    /**
+     * 个人史
+     */
+    private String personalHistory;
+
+    /**
+     * 婚育史
+     */
+    private String maritalHistory;
+
+    /**
+     * 月经史
+     */
+    private String menstrualHistory;
+
+    /**
+     * 家族史
+     */
+    private String familyHistory;
+
+    /**
+     * 喂养史
+     */
+    private String feedingHistory;
+
+    /**
+     * 手术外伤史
+     */
+    private String operationHistory;
+
+    /**
+     * 输血史
+     */
+    private String bloodHistory;
+
+    /**
+     * 传染病史
+     */
+    private String infectionHistory;
+
+    /**
+     * 专科检查
+     */
+    private String specialVital;
+
+    /**
+     * 辅助检查
+     */
+    private String assistantExam;
+
+    /**
+     * 实验室检查
+     */
+    private String lisExam;
+
+    /**
+     * 影像学检查
+     */
+    private String pacsExam;
+
+    /**
+     * 初步诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 补充诊断
+     */
+    private String supplyDiagnosis;
+
+    /**
+     * 修正诊断
+     */
+    private String revisedDiagnosis;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private String recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private String auditDate;
+
+    /**
+     * 体温
+     */
+    private String temperature;
+
+    /**
+     * 脉搏
+     */
+    private String pulse;
+
+    /**
+     * 呼吸
+     */
+    private String breathe;
+
+    /**
+     * 血压
+     */
+    private String bloodPressure;
+
+    /**
+     * 疼痛
+     */
+    private String pain;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * BMI
+     */
+    private String bmi;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

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

@@ -161,7 +161,7 @@ public class DataController {
     @PostMapping("/analyseRec")
     @SysLogger("analyseRec")
     public RespDTO analyseRec(@RequestBody AColumnVO aColumnVO){
-        columnFacade.analyseRec(aColumnVO.getHospitalId(),aColumnVO.getModeId(),aColumnVO.getMedicalRecord());
+        columnFacade.analyseRec(aColumnVO.getHospitalId(),aColumnVO.getModeId(),aColumnVO.getContent());
         return RespDTO.onSuc(true);
     }
 }

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.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      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
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -164,7 +164,7 @@ oath.self.address: http://${myhost}:${server.port}
 
 # 加解密开关
 encrypt:
-  enable: true
+  enable: false
 
 swagger:
   enable: true