Bladeren bron

对外结构化接口调整归一,添加解析开关控制,不解析时先入库

liuqq 4 jaren geleden
bovenliggende
commit
66020de4bf
50 gewijzigde bestanden met toevoegingen van 923 en 2104 verwijderingen
  1. 0 87
      src/main/java/com/diagbot/facade/data/AStrAdmissionNoteFacade.java
  2. 0 82
      src/main/java/com/diagbot/facade/data/AStrBloodResultFacade.java
  3. 0 88
      src/main/java/com/diagbot/facade/data/AStrBloodTransfusionFacade.java
  4. 0 89
      src/main/java/com/diagbot/facade/data/AStrConsultationApplyFacade.java
  5. 0 91
      src/main/java/com/diagbot/facade/data/AStrConsultationNoteFacade.java
  6. 0 92
      src/main/java/com/diagbot/facade/data/AStrConsultationRecordFacade.java
  7. 0 90
      src/main/java/com/diagbot/facade/data/AStrConsultationResultFacade.java
  8. 0 85
      src/main/java/com/diagbot/facade/data/AStrCrisisNoteFacade.java
  9. 0 88
      src/main/java/com/diagbot/facade/data/AStrDeathDiscussionFacade.java
  10. 0 88
      src/main/java/com/diagbot/facade/data/AStrDeathNoteFacade.java
  11. 0 85
      src/main/java/com/diagbot/facade/data/AStrDifficultCaseFacade.java
  12. 0 86
      src/main/java/com/diagbot/facade/data/AStrFirstRecordFacade.java
  13. 0 85
      src/main/java/com/diagbot/facade/data/AStrIllCriticallyFacade.java
  14. 0 85
      src/main/java/com/diagbot/facade/data/AStrIllSeriouslFacade.java
  15. 0 88
      src/main/java/com/diagbot/facade/data/AStrLeaveHospitalFacade.java
  16. 0 90
      src/main/java/com/diagbot/facade/data/AStrOperativeFirstRecord.java
  17. 0 89
      src/main/java/com/diagbot/facade/data/AStrOperativeNoteFacade.java
  18. 0 88
      src/main/java/com/diagbot/facade/data/AStrPeriodConclusionFacade.java
  19. 0 87
      src/main/java/com/diagbot/facade/data/AStrPreoperativeDiscussionFacade.java
  20. 0 87
      src/main/java/com/diagbot/facade/data/AStrRescueNoteFacade.java
  21. 0 87
      src/main/java/com/diagbot/facade/data/AStrTransferInNoteFacade.java
  22. 0 85
      src/main/java/com/diagbot/facade/data/AStrTransferOutNoteFacade.java
  23. 0 87
      src/main/java/com/diagbot/facade/data/AStrWardRecordFacade.java
  24. 117 55
      src/main/java/com/diagbot/facade/data/ColumnFacade.java
  25. 51 28
      src/main/java/com/diagbot/facade/str/BStrAdmissionNoteFacade.java
  26. 31 0
      src/main/java/com/diagbot/facade/str/BStrBloodResultFacade.java
  27. 31 0
      src/main/java/com/diagbot/facade/str/BStrBloodTransfusionFacade.java
  28. 31 1
      src/main/java/com/diagbot/facade/str/BStrConsultationApplyFacade.java
  29. 31 1
      src/main/java/com/diagbot/facade/str/BStrConsultationNoteFacade.java
  30. 31 1
      src/main/java/com/diagbot/facade/str/BStrConsultationRecordFacade.java
  31. 31 1
      src/main/java/com/diagbot/facade/str/BStrConsultationResultFacade.java
  32. 11 1
      src/main/java/com/diagbot/facade/str/BStrContentFacade.java
  33. 31 0
      src/main/java/com/diagbot/facade/str/BStrCrisisNoteFacade.java
  34. 31 1
      src/main/java/com/diagbot/facade/str/BStrDeathDiscussionFacade.java
  35. 31 1
      src/main/java/com/diagbot/facade/str/BStrDeathNoteFacade.java
  36. 31 0
      src/main/java/com/diagbot/facade/str/BStrDifficultCaseFacade.java
  37. 31 0
      src/main/java/com/diagbot/facade/str/BStrFirstRecordFacade.java
  38. 31 0
      src/main/java/com/diagbot/facade/str/BStrIllCriticallyFacade.java
  39. 31 0
      src/main/java/com/diagbot/facade/str/BStrIllSeriouslFacade.java
  40. 31 0
      src/main/java/com/diagbot/facade/str/BStrInformedConsentFacade.java
  41. 31 1
      src/main/java/com/diagbot/facade/str/BStrLeaveHospitalFacade.java
  42. 31 1
      src/main/java/com/diagbot/facade/str/BStrOperativeFirstRecordFacade.java
  43. 31 1
      src/main/java/com/diagbot/facade/str/BStrOperativeNoteFacade.java
  44. 31 0
      src/main/java/com/diagbot/facade/str/BStrPeriodConclusionFacade.java
  45. 31 1
      src/main/java/com/diagbot/facade/str/BStrPreoperativeDiscussionFacade.java
  46. 31 0
      src/main/java/com/diagbot/facade/str/BStrRescueNoteFacade.java
  47. 31 0
      src/main/java/com/diagbot/facade/str/BStrTalkInformFacade.java
  48. 31 0
      src/main/java/com/diagbot/facade/str/BStrTransferInNoteFacade.java
  49. 31 0
      src/main/java/com/diagbot/facade/str/BStrTransferOutNoteFacade.java
  50. 31 1
      src/main/java/com/diagbot/facade/str/BStrWardRecordFacade.java

+ 0 - 87
src/main/java/com/diagbot/facade/data/AStrAdmissionNoteFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrAdmissionNote;
-import com.diagbot.service.impl.StrAdmissionNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrAdmissionNoteVO;
-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;
-
-@Component
-public class AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh() {
-        List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
-        list.forEach(s -> {
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap = EntityUtil.makeMapWithKeyValue(list, "ch", "en");
-        Boolean flag = columnFacade.createColumn(columnMap, "strAdmissionNote");
-
-        //Map<String, String> map=columnFacade.getColumn("strAdmissionNote");
-        if (!flag) {
-            return;
-        }
-    }
-
-    //入院记录
-    public void dealData(String columnMap, Map<String, Object> entityMap, Long hospitalId) {
-        StrAdmissionNote strAdmissionNote = new StrAdmissionNote();
-        try {
-            AStrAdmissionNoteVO strAdmissionNoteVO = (AStrAdmissionNoteVO) MapUtil.mapToObject(entityMap, AStrAdmissionNoteVO.class);
-            BeanUtils.copyProperties(strAdmissionNoteVO, strAdmissionNote);
-            strAdmissionNote.setHospitalId(hospitalId);//医院编码
-
-            strAdmissionNote.setAuditDate(DateUtil.parseDateTime(strAdmissionNoteVO.getAuditDate()));//审核时间
-            strAdmissionNote.setRecDate(DateUtil.parseDateTime(strAdmissionNoteVO.getRecDate()));//记录时间
-            strAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(strAdmissionNoteVO.getBehospitalDate()));//入院日期
-            strAdmissionNote.setBirthday(DateUtil.parseDate(strAdmissionNoteVO.getBirthday()));//出生日期
-            strAdmissionNote.setRecordDate(DateUtil.parseDateTime(strAdmissionNoteVO.getRecordDate()));//病历日期
-
-            strAdmissionNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if (isExist(strAdmissionNote)) {
-                strAdmissionNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strAdmissionNote);
-            } else {
-                strAdmissionNote.setGmtModified(new Date());//记录修改时间
-                this.update(strAdmissionNote, new QueryWrapper<StrAdmissionNote>()
-                        .eq("rec_id", strAdmissionNote.getRecId())
-                        .eq("hospital_id", strAdmissionNote.getHospitalId())
-                        .eq("behospital_code", strAdmissionNote.getBehospitalCode()));
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录", strAdmissionNote.getRecId(), JSON.toJSONString(entityMap), "", e.getMessage());
-        }
-    }
-
-    public Boolean isExist(StrAdmissionNote strAdmissionNote) {
-        Boolean flag = true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrAdmissionNote>()
-                .eq("rec_id", strAdmissionNote.getRecId())
-                .eq("hospital_id", strAdmissionNote.getHospitalId())
-                .eq("behospital_code", strAdmissionNote.getBehospitalCode()));
-        if (count > 0) {
-            flag = false;
-        }
-        return flag;
-    }
-
-}

+ 0 - 82
src/main/java/com/diagbot/facade/data/AStrBloodResultFacade.java

@@ -1,82 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrBloodResult;
-import com.diagbot.service.impl.StrBloodResultServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrBloodResultVO;
-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;
-
-@Component
-public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strBloodResult");
-        if(!flag){
-            return;
-        }
-        //Map<String, String> map=columnFacade.getColumn("strBloodResult");
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrBloodResult strBloodResult=new StrBloodResult();
-        try {
-            AStrBloodResultVO strBloodResultVO=(AStrBloodResultVO) MapUtil.mapToObject(entityMap, AStrBloodResultVO.class);
-            BeanUtils.copyProperties(strBloodResultVO,strBloodResult);
-            strBloodResult.setHospitalId(hospitalId);//医院编码
-            strBloodResult.setAuditDate(DateUtil.parseDateTime(strBloodResultVO.getAuditDate()));//审核时间
-            strBloodResult.setRecDate(DateUtil.parseDateTime(strBloodResultVO.getRecDate()));//记录时间
-            strBloodResult.setRecordDate(DateUtil.parseDateTime(strBloodResultVO.getRecordDate()));//病历日期
-
-            strBloodResult.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strBloodResult)){
-                strBloodResult.setGmtCreate(new Date());//记录创建时间
-                this.save(strBloodResult);
-            }else{
-                strBloodResult.setGmtModified(new Date());//记录修改时间
-                this.update(strBloodResult,new QueryWrapper<StrBloodResult>()
-                        .eq("rec_id", strBloodResult.getRecId())
-                        .eq("hospital_id", strBloodResult.getHospitalId())
-                        .eq("behospital_code", strBloodResult.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("输血效果评价",strBloodResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrBloodResult strBloodResult){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrBloodResult>()
-                .eq("rec_id", strBloodResult.getRecId())
-                .eq("hospital_id", strBloodResult.getHospitalId())
-                .eq("behospital_code", strBloodResult.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 88
src/main/java/com/diagbot/facade/data/AStrBloodTransfusionFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrBloodTransfusion;
-import com.diagbot.service.impl.StrBloodTransfusionServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrBloodTransfusionVO;
-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;
-
-@Component
-public class AStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strBloodTransfusion");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrBloodTransfusion strBloodTransfusion=new StrBloodTransfusion();
-        try {
-            AStrBloodTransfusionVO strBloodTransfusionVO=(AStrBloodTransfusionVO) MapUtil.mapToObject(entityMap, AStrBloodTransfusionVO.class);
-            BeanUtils.copyProperties(strBloodTransfusionVO,strBloodTransfusion);
-            strBloodTransfusion.setHospitalId(hospitalId);//医院编码
-            strBloodTransfusion.setStartTime(DateUtil.parseDateTime(strBloodTransfusionVO.getStartTime()));
-            strBloodTransfusion.setEndTime(DateUtil.parseDateTime(strBloodTransfusionVO.getEndTime()));
-            strBloodTransfusion.setAuditDate(DateUtil.parseDateTime(strBloodTransfusionVO.getAuditDate()));//审核时间
-            strBloodTransfusion.setRecDate(DateUtil.parseDateTime(strBloodTransfusionVO.getRecDate()));//记录时间
-            strBloodTransfusion.setRecordDate(DateUtil.parseDateTime(strBloodTransfusionVO.getRecordDate()));//病历日期
-
-            strBloodTransfusion.setWholeData(columnMap);
-
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strBloodTransfusion)){
-                strBloodTransfusion.setGmtCreate(new Date());//记录创建时间
-                this.save(strBloodTransfusion);
-            }else{
-                strBloodTransfusion.setGmtModified(new Date());//记录修改时间
-                this.update(strBloodTransfusion,new QueryWrapper<StrBloodTransfusion>()
-                        .eq("rec_id", strBloodTransfusion.getRecId())
-                        .eq("hospital_id", strBloodTransfusion.getHospitalId())
-                        .eq("behospital_code", strBloodTransfusion.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("输血记录", strBloodTransfusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrBloodTransfusion strBloodTransfusion){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrBloodTransfusion>()
-                .eq("rec_id", strBloodTransfusion.getRecId())
-                .eq("hospital_id", strBloodTransfusion.getHospitalId())
-                .eq("behospital_code", strBloodTransfusion.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 89
src/main/java/com/diagbot/facade/data/AStrConsultationApplyFacade.java

@@ -1,89 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrConsultationApply;
-import com.diagbot.service.impl.StrConsultationApplyServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrConsultationApplyVO;
-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;
-
-@Component
-public class AStrConsultationApplyFacade extends StrConsultationApplyServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strConsultationApply");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //会诊申请单
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrConsultationApply strConsultationApply=new StrConsultationApply();
-        try {
-            AStrConsultationApplyVO strConsultationApplyVO=(AStrConsultationApplyVO) MapUtil.mapToObject(entityMap, AStrConsultationApplyVO.class);
-            BeanUtils.copyProperties(strConsultationApplyVO,strConsultationApply);
-            strConsultationApply.setHospitalId(hospitalId);//医院编码
-
-            strConsultationApply.setAuditDate(DateUtil.parseDateTime(strConsultationApplyVO.getAuditDate()));//审核时间
-            strConsultationApply.setRecDate(DateUtil.parseDateTime(strConsultationApplyVO.getRecDate()));//记录时间
-            strConsultationApply.setBehospitalDate(DateUtil.parseDateTime(strConsultationApplyVO.getBehospitalDate()));//入院日期
-            strConsultationApply.setRecordDate(DateUtil.parseDateTime(strConsultationApplyVO.getRecordDate()));//病历日期
-            strConsultationApply.setApplyDate(DateUtil.parseDateTime(strConsultationApplyVO.getApplyDate()));//申请日期
-            strConsultationApply.setConsultationDate(DateUtil.parseDateTime(strConsultationApplyVO.getConsultationDate()));//会诊时间
-            strConsultationApply.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strConsultationApply)){
-                strConsultationApply.setGmtCreate(new Date());//记录创建时间
-                this.save(strConsultationApply);
-            }else{
-                strConsultationApply.setGmtModified(new Date());//记录修改时间
-                this.update(strConsultationApply,new QueryWrapper<StrConsultationApply>()
-                        .eq("rec_id", strConsultationApply.getRecId())
-                        .eq("hospital_id", strConsultationApply.getHospitalId())
-                        .eq("behospital_code", strConsultationApply.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊申请单",strConsultationApply.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrConsultationApply strConsultationApply){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrConsultationApply>()
-                .eq("rec_id", strConsultationApply.getRecId())
-                .eq("hospital_id", strConsultationApply.getHospitalId())
-                .eq("behospital_code", strConsultationApply.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-
-}

+ 0 - 91
src/main/java/com/diagbot/facade/data/AStrConsultationNoteFacade.java

@@ -1,91 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrConsultationNote;
-import com.diagbot.service.impl.StrConsultationNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrConsultationNoteVO;
-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;
-
-@Component
-public class AStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap=EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strConsultationNote");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //会诊单(申请和结果)
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrConsultationNote strConsultationNote=new StrConsultationNote();
-        try {
-            AStrConsultationNoteVO strConsultationNoteVO=(AStrConsultationNoteVO) MapUtil.mapToObject(entityMap, AStrConsultationNoteVO.class);
-            BeanUtils.copyProperties(strConsultationNoteVO,strConsultationNote);
-            strConsultationNote.setHospitalId(hospitalId);//医院编码
-
-            strConsultationNote.setAuditDate(DateUtil.parseDateTime(strConsultationNoteVO.getAuditDate()));//审核时间
-            strConsultationNote.setRecDate(DateUtil.parseDateTime(strConsultationNoteVO.getRecDate()));//记录时间
-            strConsultationNote.setBehospitalDate(DateUtil.parseDateTime(strConsultationNoteVO.getBehospitalDate()));//入院日期
-            strConsultationNote.setApplyDate(DateUtil.parseDate(strConsultationNoteVO.getApplyDate()));//申请日期
-            strConsultationNote.setRecordDate(DateUtil.parseDateTime(strConsultationNoteVO.getRecordDate()));//病历日期
-            strConsultationNote.setConsultationDate(DateUtil.parseDateTime(strConsultationNoteVO.getConsultationDate()));//会诊时间
-
-            strConsultationNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strConsultationNote)){
-                strConsultationNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strConsultationNote);
-            }else{
-                strConsultationNote.setGmtModified(new Date());//记录修改时间
-                this.update(strConsultationNote,new QueryWrapper<StrConsultationNote>()
-                        .eq("rec_id", strConsultationNote.getRecId())
-                        .eq("hospital_id", strConsultationNote.getHospitalId())
-                        .eq("behospital_code", strConsultationNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊单(申请和结果)",strConsultationNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrConsultationNote strConsultationNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrConsultationNote>()
-                .eq("rec_id", strConsultationNote.getRecId())
-                .eq("hospital_id", strConsultationNote.getHospitalId())
-                .eq("behospital_code", strConsultationNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-
-}

+ 0 - 92
src/main/java/com/diagbot/facade/data/AStrConsultationRecordFacade.java

@@ -1,92 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrConsultationRecord;
-import com.diagbot.service.impl.StrConsultationRecordServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.AStrConsultationRecordVO;
-import com.diagbot.vo.data.AStrConsultationNoteVO;
-import com.diagbot.vo.data.AStrConsultationResultVO;
-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;
-@Component
-public class AStrConsultationRecordFacade extends StrConsultationRecordServiceImpl {
-
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strConsultationRecord");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //会诊记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrConsultationRecord strConsultationRecord=new StrConsultationRecord();
-        try {
-            AStrConsultationRecordVO AStrConsultationRecordVO=(AStrConsultationRecordVO) MapUtil.mapToObject(entityMap, AStrConsultationRecordVO.class);
-            BeanUtils.copyProperties(AStrConsultationRecordVO,strConsultationRecord);
-            strConsultationRecord.setHospitalId(hospitalId);//医院编码
-
-            strConsultationRecord.setRecordDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getRecordDate()));//病历日期recordDate
-            strConsultationRecord.setBehospitalDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getBehospitalDate()));//入院日期behospital_date
-            strConsultationRecord.setApplyDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getApplyDate()));//申请日期apply_date
-            strConsultationRecord.setConsultationDate(DateUtil.parseDate(AStrConsultationRecordVO.getConsultationArriveDate()));//会诊时间consultation_date
-            strConsultationRecord.setRecDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getRecDate()));//记录时间rec_date
-            strConsultationRecord.setAuditDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getAuditDate()));//审核时间audit_date
-
-            strConsultationRecord.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strConsultationRecord)){
-                strConsultationRecord.setGmtCreate(new Date());//记录创建时间
-                this.save(strConsultationRecord);
-            }else{
-                strConsultationRecord.setGmtModified(new Date());//记录修改时间
-                this.update(strConsultationRecord,new QueryWrapper<StrConsultationRecord>()
-                        .eq("rec_id", strConsultationRecord.getRecId())
-                        .eq("hospital_id", strConsultationRecord.getHospitalId())
-                        .eq("behospital_code", strConsultationRecord.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊记录)",strConsultationRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrConsultationRecord strConsultationRecord){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrConsultationRecord>()
-                .eq("rec_id", strConsultationRecord.getRecId())
-                .eq("hospital_id", strConsultationRecord.getHospitalId())
-                .eq("behospital_code", strConsultationRecord.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 90
src/main/java/com/diagbot/facade/data/AStrConsultationResultFacade.java

@@ -1,90 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrConsultationResult;
-import com.diagbot.service.impl.StrConsultationResultServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrConsultationResultVO;
-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;
-
-@Component
-public class AStrConsultationResultFacade extends StrConsultationResultServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strConsultationResult");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //会诊结果单
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrConsultationResult strConsultationResult=new StrConsultationResult();
-        try {
-            AStrConsultationResultVO strConsultationResultVO=(AStrConsultationResultVO) MapUtil.mapToObject(entityMap, AStrConsultationResultVO.class);
-            BeanUtils.copyProperties(strConsultationResultVO,strConsultationResult);
-            strConsultationResult.setHospitalId(hospitalId);//医院编码
-
-            strConsultationResult.setAuditDate(DateUtil.parseDateTime(strConsultationResultVO.getAuditDate()));//审核时间
-            strConsultationResult.setRecDate(DateUtil.parseDateTime(strConsultationResultVO.getRecDate()));//记录时间
-            strConsultationResult.setBehospitalDate(DateUtil.parseDateTime(strConsultationResultVO.getBehospitalDate()));//入院日期
-            strConsultationResult.setApplyDate(DateUtil.parseDate(strConsultationResultVO.getApplyDate()));//申请时间
-            strConsultationResult.setRecordDate(DateUtil.parseDateTime(strConsultationResultVO.getRecordDate()));//病历日期
-            strConsultationResult.setConsultationArriveDate(DateUtil.parseDateTime(strConsultationResultVO.getConsultationArriveDate()));//会诊到达时间
-
-            strConsultationResult.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strConsultationResult)){
-                strConsultationResult.setGmtCreate(new Date());//记录创建时间
-                this.save(strConsultationResult);
-            }else{
-                strConsultationResult.setGmtModified(new Date());//记录修改时间
-                this.update(strConsultationResult,new QueryWrapper<StrConsultationResult>()
-                        .eq("rec_id", strConsultationResult.getRecId())
-                        .eq("hospital_id", strConsultationResult.getHospitalId())
-                        .eq("behospital_code", strConsultationResult.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊结果单",strConsultationResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrConsultationResult strConsultationResult){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrConsultationResult>()
-                .eq("rec_id", strConsultationResult.getRecId())
-                .eq("hospital_id", strConsultationResult.getHospitalId())
-                .eq("behospital_code", strConsultationResult.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 85
src/main/java/com/diagbot/facade/data/AStrCrisisNoteFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrCrisisNote;
-import com.diagbot.service.impl.StrCrisisNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrCrisisNoteVO;
-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;
-
-@Component
-public class AStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strCrisisNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrCrisisNote strCrisisNote=new StrCrisisNote();
-        try {
-            AStrCrisisNoteVO strCrisisNoteVO=(AStrCrisisNoteVO) MapUtil.mapToObject(entityMap, AStrCrisisNoteVO.class);
-            BeanUtils.copyProperties(strCrisisNoteVO,strCrisisNote);
-            strCrisisNote.setHospitalId(hospitalId);//医院编码
-
-            strCrisisNote.setAuditDate(DateUtil.parseDateTime(strCrisisNoteVO.getAuditDate()));//审核时间
-            strCrisisNote.setRecDate(DateUtil.parseDateTime(strCrisisNoteVO.getRecDate()));//记录时间
-            strCrisisNote.setRecieveDate(DateUtil.parseDateTime(strCrisisNoteVO.getRecieveDate()));//开始时间
-            strCrisisNote.setAuditDate(DateUtil.parseDate(strCrisisNoteVO.getAuditDate()));//结束时间
-            strCrisisNote.setRecordDate(DateUtil.parseDateTime(strCrisisNoteVO.getRecordDate()));//病历日期
-
-            strCrisisNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strCrisisNote)){
-                strCrisisNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strCrisisNote);
-            }else{
-                strCrisisNote.setGmtModified(new Date());//记录修改时间
-                this.update(strCrisisNote,new QueryWrapper<StrCrisisNote>()
-                        .eq("rec_id", strCrisisNote.getRecId())
-                        .eq("hospital_id", strCrisisNote.getHospitalId())
-                        .eq("behospital_code", strCrisisNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值记录",strCrisisNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrCrisisNote strCrisisNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrCrisisNote>()
-                .eq("rec_id", strCrisisNote.getRecId())
-                .eq("hospital_id", strCrisisNote.getHospitalId())
-                .eq("behospital_code", strCrisisNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 88
src/main/java/com/diagbot/facade/data/AStrDeathDiscussionFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrDeathDiscussion;
-import com.diagbot.service.impl.StrDeathDiscussionServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrDeathDiscussionVO;
-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;
-
-@Component
-public class AStrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strDeathDiscussion");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //死亡病例讨论记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrDeathDiscussion strDeathDiscussion=new StrDeathDiscussion();
-        try {
-            AStrDeathDiscussionVO strDeathDiscussionVO=(AStrDeathDiscussionVO) MapUtil.mapToObject(entityMap, AStrDeathDiscussionVO.class);
-            BeanUtils.copyProperties(strDeathDiscussionVO,strDeathDiscussion);
-            strDeathDiscussion.setHospitalId(hospitalId);//医院编码
-
-            strDeathDiscussion.setAuditDate(DateUtil.parseDateTime(strDeathDiscussionVO.getAuditDate()));//审核时间
-            strDeathDiscussion.setRecDate(DateUtil.parseDateTime(strDeathDiscussionVO.getRecDate()));//记录时间
-            strDeathDiscussion.setDeathDate(DateUtil.parseDateTime(strDeathDiscussionVO.getDeathDate()));//死亡时间
-            strDeathDiscussion.setDiscussDate(DateUtil.parseDate(strDeathDiscussionVO.getDiscussDate()));//讨论时间
-            strDeathDiscussion.setRecordDate(DateUtil.parseDateTime(strDeathDiscussionVO.getRecordDate()));//病历日期
-
-            strDeathDiscussion.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strDeathDiscussion)){
-                strDeathDiscussion.setGmtCreate(new Date());//记录创建时间
-                this.save(strDeathDiscussion);
-            }else{
-                strDeathDiscussion.setGmtModified(new Date());//记录修改时间
-                this.update(strDeathDiscussion,new QueryWrapper<StrDeathDiscussion>()
-                        .eq("rec_id", strDeathDiscussion.getRecId())
-                        .eq("hospital_id", strDeathDiscussion.getHospitalId())
-                        .eq("behospital_code", strDeathDiscussion.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡病例讨论记录",strDeathDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrDeathDiscussion strDeathDiscussion){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrDeathDiscussion>()
-                .eq("rec_id", strDeathDiscussion.getRecId())
-                .eq("hospital_id", strDeathDiscussion.getHospitalId())
-                .eq("behospital_code", strDeathDiscussion.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 88
src/main/java/com/diagbot/facade/data/AStrDeathNoteFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrDeathNote;
-import com.diagbot.service.impl.StrDeathNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrDeathNoteVO;
-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;
-
-@Component
-public class AStrDeathNoteFacade extends StrDeathNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strDeathNote");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //死亡记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrDeathNote strDeathNote=new StrDeathNote();
-        try {
-            AStrDeathNoteVO strDeathNoteVO=(AStrDeathNoteVO) MapUtil.mapToObject(entityMap, AStrDeathNoteVO.class);
-            BeanUtils.copyProperties(strDeathNoteVO,strDeathNote);
-            strDeathNote.setHospitalId(hospitalId);//医院编码
-
-            strDeathNote.setAuditDate(DateUtil.parseDateTime(strDeathNoteVO.getAuditDate()));//审核时间
-            strDeathNote.setRecDate(DateUtil.parseDateTime(strDeathNoteVO.getRecDate()));//记录时间
-            strDeathNote.setBehospitalDate(DateUtil.parseDateTime(strDeathNoteVO.getBehospitalDate()));//入院日期
-            strDeathNote.setDeathDate(DateUtil.parseDate(strDeathNoteVO.getDeathDate()));//死亡日期
-            strDeathNote.setRecordDate(DateUtil.parseDateTime(strDeathNoteVO.getRecordDate()));//病历日期
-
-            strDeathNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strDeathNote)){
-                strDeathNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strDeathNote);
-            }else{
-                strDeathNote.setGmtModified(new Date());//记录修改时间
-                this.update(strDeathNote,new QueryWrapper<StrDeathNote>()
-                        .eq("rec_id", strDeathNote.getRecId())
-                        .eq("hospital_id", strDeathNote.getHospitalId())
-                        .eq("behospital_code", strDeathNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡记录", strDeathNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrDeathNote strDeathNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrDeathNote>()
-                .eq("rec_id", strDeathNote.getRecId())
-                .eq("hospital_id", strDeathNote.getHospitalId())
-                .eq("behospital_code", strDeathNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 85
src/main/java/com/diagbot/facade/data/AStrDifficultCaseFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrDifficultCase;
-import com.diagbot.service.impl.StrDifficultCaseServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrDifficultCaseVO;
-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;
-
-@Component
-public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strDifficultCase");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrDifficultCase medDifficult=new StrDifficultCase();
-        try {
-            AStrDifficultCaseVO medDifficultVO=(AStrDifficultCaseVO) MapUtil.mapToObject(entityMap, AStrDifficultCaseVO.class);
-            BeanUtils.copyProperties(medDifficultVO,medDifficult);
-            medDifficult.setHospitalId(hospitalId);//医院编码
-            medDifficult.setRecDate(DateUtil.parseDateTime(medDifficultVO.getRecDate()));
-            medDifficult.setAuditDate(DateUtil.parseDateTime(medDifficultVO.getAuditDate()));
-            medDifficult.setDiscussDate(DateUtil.parseDateTime(medDifficultVO.getDiscussDate()));
-            medDifficult.setRecordDate(DateUtil.parseDateTime(medDifficultVO.getRecordDate()));//病历日期
-
-            medDifficult.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(medDifficult)){
-                medDifficult.setGmtCreate(new Date());//记录创建时间
-                this.save(medDifficult);
-            }else{
-                medDifficult.setGmtModified(new Date());//记录修改时间
-                this.update(medDifficult,new QueryWrapper<StrDifficultCase>()
-                        .eq("rec_id", medDifficult.getRecId())
-                        .eq("hospital_id", medDifficult.getHospitalId())
-                        .eq("behospital_code", medDifficult.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("疑难病例讨论记录",medDifficult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrDifficultCase medDifficult){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrDifficultCase>()
-                .eq("rec_id", medDifficult.getRecId())
-                .eq("hospital_id", medDifficult.getHospitalId())
-                .eq("behospital_code", medDifficult.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 86
src/main/java/com/diagbot/facade/data/AStrFirstRecordFacade.java

@@ -1,86 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrFirstRecord;
-import com.diagbot.service.impl.StrFirstRecordServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrFirstRecordVO;
-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;
-
-@Component
-public class AStrFirstRecordFacade extends StrFirstRecordServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strFirstRecord");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrFirstRecord strFirstRecord=new StrFirstRecord();
-        try {
-            AStrFirstRecordVO strFirstRecordVO=(AStrFirstRecordVO) MapUtil.mapToObject(entityMap, AStrFirstRecordVO.class);
-            BeanUtils.copyProperties(strFirstRecordVO,strFirstRecord);
-            strFirstRecord.setHospitalId(hospitalId);//医院编码
-
-            strFirstRecord.setAuditDate(DateUtil.parseDateTime(strFirstRecordVO.getAuditDate()));//审核时间
-            strFirstRecord.setRecDate(DateUtil.parseDateTime(strFirstRecordVO.getRecDate()));//记录时间
-            strFirstRecord.setRecordDate(DateUtil.parseDateTime(strFirstRecordVO.getRecordDate()));//病历日期
-
-            strFirstRecord.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strFirstRecord)){
-                strFirstRecord.setGmtCreate(new Date());//记录创建时间
-                this.save(strFirstRecord);
-            }else{
-                strFirstRecord.setGmtModified(new Date());//记录修改时间
-                this.update(strFirstRecord,new QueryWrapper<StrFirstRecord>()
-                        .eq("rec_id", strFirstRecord.getRecId())
-                        .eq("hospital_id", strFirstRecord.getHospitalId())
-                        .eq("behospital_code", strFirstRecord.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("首次病程录", strFirstRecord.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrFirstRecord strFirstRecord){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrFirstRecord>()
-                .eq("rec_id", strFirstRecord.getRecId())
-                .eq("hospital_id", strFirstRecord.getHospitalId())
-                .eq("behospital_code", strFirstRecord.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 85
src/main/java/com/diagbot/facade/data/AStrIllCriticallyFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrIllCritically;
-import com.diagbot.service.impl.StrIllCriticallyServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrIllCriticallyVO;
-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;
-
-@Component
-public class AStrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strIllCritically");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrIllCritically strIllCritically=new StrIllCritically();
-        try {
-            AStrIllCriticallyVO strIllCriticallyVO=(AStrIllCriticallyVO) MapUtil.mapToObject(entityMap, AStrIllCriticallyVO.class);
-            BeanUtils.copyProperties(strIllCriticallyVO,strIllCritically);
-            strIllCritically.setHospitalId(hospitalId);//医院编码
-            strIllCritically.setPatientSignDate(DateUtil.parseDateTime(strIllCriticallyVO.getPatientSignDate()));
-            strIllCritically.setDoctorSignDate(DateUtil.parseDateTime(strIllCriticallyVO.getDoctorSignDate()));//审核时间
-            strIllCritically.setRecordDate(DateUtil.parseDateTime(strIllCriticallyVO.getRecordDate()));//病历日期
-
-            strIllCritically.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strIllCritically)){
-                strIllCritically.setGmtCreate(new Date());//记录创建时间
-                this.save(strIllCritically);
-            }else{
-                strIllCritically.setGmtModified(new Date());//记录修改时间
-                this.update(strIllCritically,new QueryWrapper<StrIllCritically>()
-                        .eq("rec_id", strIllCritically.getRecId())
-                        .eq("hospital_id", strIllCritically.getHospitalId())
-                        .eq("behospital_code", strIllCritically.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病危通知单",strIllCritically.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrIllCritically strIllCritically){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrIllCritically>()
-                .eq("rec_id", strIllCritically.getRecId())
-                .eq("hospital_id", strIllCritically.getHospitalId())
-                .eq("behospital_code", strIllCritically.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 85
src/main/java/com/diagbot/facade/data/AStrIllSeriouslFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrIllSeriousl;
-import com.diagbot.service.impl.StrIllSeriouslServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrIllSeriouslVO;
-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;
-
-@Component
-public class AStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strIllSeriousl");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrIllSeriousl strIllSeriousl=new StrIllSeriousl();
-        try {
-            AStrIllSeriouslVO strIllSeriouslVO=(AStrIllSeriouslVO) MapUtil.mapToObject(entityMap, AStrIllSeriouslVO.class);
-            BeanUtils.copyProperties(strIllSeriouslVO,strIllSeriousl);
-            strIllSeriousl.setHospitalId(hospitalId);//医院编码
-            strIllSeriousl.setPatientSignDate(DateUtil.parseDateTime(strIllSeriouslVO.getPatientSignDate()));
-            strIllSeriousl.setDoctorSignDate(DateUtil.parseDateTime(strIllSeriouslVO.getDoctorSignDate()));//审核时间
-            strIllSeriousl.setRecordDate(DateUtil.parseDateTime(strIllSeriouslVO.getRecordDate()));//病历日期
-
-            strIllSeriousl.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strIllSeriousl)){
-                strIllSeriousl.setGmtCreate(new Date());//记录创建时间
-                this.save(strIllSeriousl);
-            }else{
-                strIllSeriousl.setGmtModified(new Date());//记录修改时间
-                this.update(strIllSeriousl,new QueryWrapper<StrIllSeriousl>()
-                        .eq("rec_id", strIllSeriousl.getRecId())
-                        .eq("hospital_id", strIllSeriousl.getHospitalId())
-                        .eq("behospital_code", strIllSeriousl.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", strIllSeriousl.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrIllSeriousl strIllSeriousl){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrIllSeriousl>()
-                .eq("rec_id", strIllSeriousl.getRecId())
-                .eq("hospital_id", strIllSeriousl.getHospitalId())
-                .eq("behospital_code", strIllSeriousl.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 88
src/main/java/com/diagbot/facade/data/AStrLeaveHospitalFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrLeaveHospital;
-import com.diagbot.service.impl.StrLeaveHospitalServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrLeaveHospitalVO;
-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;
-
-@Component
-public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strLeaveHospital");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //危急值记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrLeaveHospital strLeaveHospital=new StrLeaveHospital();
-        try {
-            AStrLeaveHospitalVO strLeaveHospitalVO=(AStrLeaveHospitalVO) MapUtil.mapToObject(entityMap, AStrLeaveHospitalVO.class);
-            BeanUtils.copyProperties(strLeaveHospitalVO,strLeaveHospital);
-            strLeaveHospital.setHospitalId(hospitalId);//医院编码
-
-            strLeaveHospital.setAuditDate(DateUtil.parseDateTime(strLeaveHospitalVO.getAuditDate()));//审核时间
-            strLeaveHospital.setRecDate(DateUtil.parseDateTime(strLeaveHospitalVO.getRecDate()));//记录时间
-            strLeaveHospital.setBehospitalDate(DateUtil.parseDateTime(strLeaveHospitalVO.getBehospitalDate()));//入院日期
-            strLeaveHospital.setLeaveHospitalDate(DateUtil.parseDateTime(strLeaveHospitalVO.getLeaveHospitalDate()));//出院时间
-            strLeaveHospital.setRecordDate(DateUtil.parseDateTime(strLeaveHospitalVO.getRecordDate()));//病历日期
-
-            strLeaveHospital.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strLeaveHospital)){
-                strLeaveHospital.setGmtCreate(new Date());//记录创建时间
-                this.save(strLeaveHospital);
-            }else{
-                strLeaveHospital.setGmtModified(new Date());//记录修改时间
-                this.update(strLeaveHospital,new QueryWrapper<StrLeaveHospital>()
-                        .eq("rec_id", strLeaveHospital.getRecId())
-                        .eq("hospital_id", strLeaveHospital.getHospitalId())
-                        .eq("behospital_code", strLeaveHospital.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("出院小结",strLeaveHospital.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrLeaveHospital strLeaveHospital){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrLeaveHospital>()
-                .eq("rec_id", strLeaveHospital.getRecId())
-                .eq("hospital_id", strLeaveHospital.getHospitalId())
-                .eq("behospital_code", strLeaveHospital.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 90
src/main/java/com/diagbot/facade/data/AStrOperativeFirstRecord.java

@@ -1,90 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrOperativeFirstRecord;
-import com.diagbot.service.impl.StrOperativeFirstRecordServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrOperativeFirstRecordVO;
-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;
-
-@Component
-public class AStrOperativeFirstRecord extends StrOperativeFirstRecordServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strOperativeFirstRecord");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //术后首程
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrOperativeFirstRecord strOperativeFirstRecord=new StrOperativeFirstRecord();
-        try {
-            AStrOperativeFirstRecordVO strOperativeFirstRecordVO=(AStrOperativeFirstRecordVO) MapUtil.mapToObject(entityMap, AStrOperativeFirstRecordVO.class);
-            BeanUtils.copyProperties(strOperativeFirstRecordVO,strOperativeFirstRecord);
-            strOperativeFirstRecord.setHospitalId(hospitalId);//医院编码
-
-            strOperativeFirstRecord.setAuditDate(DateUtil.parseDateTime(strOperativeFirstRecordVO.getAuditDate()));//审核时间
-            strOperativeFirstRecord.setRecDate(DateUtil.parseDateTime(strOperativeFirstRecordVO.getRecDate()));//记录时间
-            strOperativeFirstRecord.setOperationDate(DateUtil.parseDateTime(strOperativeFirstRecordVO.getOperationDate()));//手术日期
-            strOperativeFirstRecord.setStartTime(DateUtil.parseDate(strOperativeFirstRecordVO.getStartTime()));//开始时间
-            strOperativeFirstRecord.setEndTime(DateUtil.parseDate(strOperativeFirstRecordVO.getEndTime()));//结束时间
-            strOperativeFirstRecord.setRecordDate(DateUtil.parseDateTime(strOperativeFirstRecordVO.getRecordDate()));//病历日期
-
-            strOperativeFirstRecord.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strOperativeFirstRecord)){
-                strOperativeFirstRecord.setGmtCreate(new Date());//记录创建时间
-                this.save(strOperativeFirstRecord);
-            }else{
-                strOperativeFirstRecord.setGmtModified(new Date());//记录修改时间
-                this.update(strOperativeFirstRecord,new QueryWrapper<StrOperativeFirstRecord>()
-                        .eq("rec_id", strOperativeFirstRecord.getRecId())
-                        .eq("hospital_id", strOperativeFirstRecord.getHospitalId())
-                        .eq("behospital_code", strOperativeFirstRecord.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("术后首程",strOperativeFirstRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrOperativeFirstRecord strOperativeFirstRecord){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrOperativeFirstRecord>()
-                .eq("rec_id", strOperativeFirstRecord.getRecId())
-                .eq("hospital_id", strOperativeFirstRecord.getHospitalId())
-                .eq("behospital_code", strOperativeFirstRecord.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 89
src/main/java/com/diagbot/facade/data/AStrOperativeNoteFacade.java

@@ -1,89 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrOperativeNote;
-import com.diagbot.service.impl.StrOperativeNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrOperativeNoteVO;
-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;
-
-@Component
-public class AStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strOperativeNote");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //手术记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrOperativeNote strOperativeNote=new StrOperativeNote();
-        try {
-            AStrOperativeNoteVO strOperativeNoteVO=(AStrOperativeNoteVO) MapUtil.mapToObject(entityMap, AStrOperativeNoteVO.class);
-            BeanUtils.copyProperties(strOperativeNoteVO,strOperativeNote);
-            strOperativeNote.setHospitalId(hospitalId);//医院编码
-
-            strOperativeNote.setAuditDate(DateUtil.parseDateTime(strOperativeNoteVO.getAuditDate()));//审核时间
-            strOperativeNote.setRecDate(DateUtil.parseDateTime(strOperativeNoteVO.getRecDate()));//记录时间
-            strOperativeNote.setOperationDate(DateUtil.parseDateTime(strOperativeNoteVO.getOperationDate()));//手术日期
-            strOperativeNote.setStartTime(DateUtil.parseDate(strOperativeNoteVO.getStartTime()));//开始时间
-            strOperativeNote.setEndTime(DateUtil.parseDate(strOperativeNoteVO.getEndTime()));//结束时间
-            strOperativeNote.setRecordDate(DateUtil.parseDateTime(strOperativeNoteVO.getRecordDate()));//病历日期
-
-            strOperativeNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strOperativeNote)){
-                strOperativeNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strOperativeNote);
-            }else{
-                strOperativeNote.setGmtModified(new Date());//记录修改时间
-                this.update(strOperativeNote,new QueryWrapper<StrOperativeNote>()
-                        .eq("rec_id", strOperativeNote.getRecId())
-                        .eq("hospital_id", strOperativeNote.getHospitalId())
-                        .eq("behospital_code", strOperativeNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("手术记录", strOperativeNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrOperativeNote strOperativeNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrOperativeNote>()
-                .eq("rec_id", strOperativeNote.getRecId())
-                .eq("hospital_id", strOperativeNote.getHospitalId())
-                .eq("behospital_code", strOperativeNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 88
src/main/java/com/diagbot/facade/data/AStrPeriodConclusionFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrPeriodConclusion;
-import com.diagbot.service.impl.StrPeriodConclusionServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrAdmissionNoteVO;
-import com.diagbot.vo.data.AStrPeriodConclusionVO;
-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;
-
-@Component
-public class AStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strPeriodConclusion");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrPeriodConclusion strPeriodConclusion=new StrPeriodConclusion();
-        try {
-            AStrPeriodConclusionVO strPeriodConclusionVO=(AStrPeriodConclusionVO) MapUtil.mapToObject(entityMap, AStrPeriodConclusionVO.class);
-            BeanUtils.copyProperties(strPeriodConclusionVO,strPeriodConclusion);
-            strPeriodConclusion.setHospitalId(hospitalId);//医院编码
-
-            strPeriodConclusion.setAuditDate(DateUtil.parseDateTime(strPeriodConclusionVO.getAuditDate()));//审核时间
-            strPeriodConclusion.setRecDate(DateUtil.parseDateTime(strPeriodConclusionVO.getRecDate()));//记录时间
-            strPeriodConclusion.setRecordDate(DateUtil.parseDateTime(strPeriodConclusionVO.getRecordDate()));//病历日期
-
-            strPeriodConclusion.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strPeriodConclusion)){
-                strPeriodConclusion.setGmtCreate(new Date());//记录创建时间
-                this.save(strPeriodConclusion);
-            }else{
-                strPeriodConclusion.setGmtModified(new Date());//记录修改时间
-                this.update(strPeriodConclusion,new QueryWrapper<StrPeriodConclusion>()
-                        .eq("rec_id", strPeriodConclusion.getRecId())
-                        .eq("hospital_id", strPeriodConclusion.getHospitalId())
-                        .eq("behospital_code", strPeriodConclusion.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("阶段小结",strPeriodConclusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrPeriodConclusion strPeriodConclusion){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrPeriodConclusion>()
-                .eq("rec_id", strPeriodConclusion.getRecId())
-                .eq("hospital_id", strPeriodConclusion.getHospitalId())
-                .eq("behospital_code", strPeriodConclusion.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-
-}

+ 0 - 87
src/main/java/com/diagbot/facade/data/AStrPreoperativeDiscussionFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrPreoperativeDiscussion;
-import com.diagbot.service.impl.StrPreoperativeDiscussionServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrPreoperativeDiscussionVO;
-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;
-
-@Component
-public class AStrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strPreoperativeDiscussion");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //入院记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrPreoperativeDiscussion strPreoperativeDiscussion=new StrPreoperativeDiscussion();
-        try {
-            AStrPreoperativeDiscussionVO strPreoperativeDiscussionVO=(AStrPreoperativeDiscussionVO) MapUtil.mapToObject(entityMap, AStrPreoperativeDiscussionVO.class);
-            BeanUtils.copyProperties(strPreoperativeDiscussionVO,strPreoperativeDiscussion);
-            strPreoperativeDiscussion.setHospitalId(hospitalId);//医院编码
-
-            strPreoperativeDiscussion.setAuditDate(DateUtil.parseDateTime(strPreoperativeDiscussionVO.getAuditDate()));//审核时间
-            strPreoperativeDiscussion.setRecDate(DateUtil.parseDateTime(strPreoperativeDiscussionVO.getRecDate()));//记录时间
-            strPreoperativeDiscussion.setDiscussTime(DateUtil.parseDateTime(strPreoperativeDiscussionVO.getDiscussTime()));//讨论时间
-            strPreoperativeDiscussion.setRecordDate(DateUtil.parseDateTime(strPreoperativeDiscussionVO.getRecordDate()));//病历日期
-
-            strPreoperativeDiscussion.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strPreoperativeDiscussion)){
-                strPreoperativeDiscussion.setGmtCreate(new Date());//记录创建时间
-                this.save(strPreoperativeDiscussion);
-            }else{
-                strPreoperativeDiscussion.setGmtModified(new Date());//记录修改时间
-                this.update(strPreoperativeDiscussion,new QueryWrapper<StrPreoperativeDiscussion>()
-                        .eq("rec_id", strPreoperativeDiscussion.getRecId())
-                        .eq("hospital_id", strPreoperativeDiscussion.getHospitalId())
-                        .eq("behospital_code", strPreoperativeDiscussion.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("术前讨论小结",strPreoperativeDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrPreoperativeDiscussion strPreoperativeDiscussion){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrPreoperativeDiscussion>()
-                .eq("rec_id", strPreoperativeDiscussion.getRecId())
-                .eq("hospital_id", strPreoperativeDiscussion.getHospitalId())
-                .eq("behospital_code", strPreoperativeDiscussion.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 87
src/main/java/com/diagbot/facade/data/AStrRescueNoteFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrRescueNote;
-import com.diagbot.service.impl.StrRescueNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrRescueNoteVO;
-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;
-
-@Component
-public class AStrRescueNoteFacade extends StrRescueNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strRescueNote");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrRescueNote strRescueNote=new StrRescueNote();
-        try {
-            AStrRescueNoteVO strRescueNoteVO=(AStrRescueNoteVO) MapUtil.mapToObject(entityMap, AStrRescueNoteVO.class);
-            BeanUtils.copyProperties(strRescueNoteVO,strRescueNote);
-            strRescueNote.setHospitalId(hospitalId);//医院编码
-
-            strRescueNote.setAuditDate(DateUtil.parseDateTime(strRescueNoteVO.getAuditDate()));//审核时间
-            strRescueNote.setRecDate(DateUtil.parseDateTime(strRescueNoteVO.getRecDate()));//记录时间
-            strRescueNote.setStartTime(DateUtil.parseDateTime(strRescueNoteVO.getStartTime()));//开始时间
-            strRescueNote.setEndTime(DateUtil.parseDate(strRescueNoteVO.getEndTime()));//结束时间
-            strRescueNote.setRecordDate(DateUtil.parseDateTime(strRescueNoteVO.getRecordDate()));//病历日期
-
-            strRescueNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strRescueNote)){
-                strRescueNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strRescueNote);
-            }else{
-                strRescueNote.setGmtModified(new Date());//记录修改时间
-                this.update(strRescueNote,new QueryWrapper<StrRescueNote>()
-                        .eq("rec_id", strRescueNote.getRecId())
-                        .eq("hospital_id", strRescueNote.getHospitalId())
-                        .eq("behospital_code", strRescueNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("抢救记录", strRescueNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrRescueNote strRescueNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrRescueNote>()
-                .eq("rec_id", strRescueNote.getRecId())
-                .eq("hospital_id", strRescueNote.getHospitalId())
-                .eq("behospital_code", strRescueNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 87
src/main/java/com/diagbot/facade/data/AStrTransferInNoteFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrTransferInNote;
-import com.diagbot.service.impl.StrTransferInNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrTransferInNoteVO;
-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;
-
-@Component
-public class AStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strTransferInNote");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrTransferInNote strTransferInNote=new StrTransferInNote();
-        try {
-            AStrTransferInNoteVO strTransferInNoteVO=(AStrTransferInNoteVO) MapUtil.mapToObject(entityMap, AStrTransferInNoteVO.class);
-            BeanUtils.copyProperties(strTransferInNoteVO,strTransferInNote);
-            strTransferInNote.setHospitalId(hospitalId);//医院编码
-            strTransferInNote.setTransferInDate(DateUtil.parseDateTime(strTransferInNoteVO.getTransferInDate()));
-            strTransferInNote.setAuditDate(DateUtil.parseDateTime(strTransferInNoteVO.getAuditDate()));//审核时间
-            strTransferInNote.setRecDate(DateUtil.parseDateTime(strTransferInNoteVO.getRecDate()));//记录时间
-            strTransferInNote.setRecordDate(DateUtil.parseDateTime(strTransferInNoteVO.getRecordDate()));//病历日期
-
-            strTransferInNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strTransferInNote)){
-                strTransferInNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strTransferInNote);
-            }else{
-                strTransferInNote.setGmtModified(new Date());//记录修改时间
-                this.update(strTransferInNote,new QueryWrapper<StrTransferInNote>()
-                        .eq("rec_id", strTransferInNote.getRecId())
-                        .eq("hospital_id", strTransferInNote.getHospitalId())
-                        .eq("behospital_code", strTransferInNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("转入记录",strTransferInNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrTransferInNote strTransferInNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrTransferInNote>()
-                .eq("rec_id", strTransferInNote.getRecId())
-                .eq("hospital_id", strTransferInNote.getHospitalId())
-                .eq("behospital_code", strTransferInNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-
-}

+ 0 - 85
src/main/java/com/diagbot/facade/data/AStrTransferOutNoteFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrTransferOutNote;
-import com.diagbot.service.impl.StrTransferOutNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrTransferOutNoteVO;
-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;
-
-@Component
-public class AStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strTransferOutNote");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrTransferOutNote strTransferOutNote=new StrTransferOutNote();
-        try {
-            AStrTransferOutNoteVO strTransferOutNoteVO=(AStrTransferOutNoteVO) MapUtil.mapToObject(entityMap, AStrTransferOutNoteVO.class);
-            BeanUtils.copyProperties(strTransferOutNoteVO,strTransferOutNote);
-            strTransferOutNote.setHospitalId(hospitalId);//医院编码
-            strTransferOutNote.setTransferInDate(DateUtil.parseDateTime(strTransferOutNoteVO.getTransferInDate()));
-            strTransferOutNote.setAuditDate(DateUtil.parseDateTime(strTransferOutNoteVO.getAuditDate()));//审核时间
-            strTransferOutNote.setRecDate(DateUtil.parseDateTime(strTransferOutNoteVO.getRecDate()));//记录时间
-            strTransferOutNote.setRecordDate(DateUtil.parseDateTime(strTransferOutNoteVO.getRecordDate()));//病历日期
-
-            strTransferOutNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strTransferOutNote)){
-                strTransferOutNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strTransferOutNote);
-            }else{
-                strTransferOutNote.setGmtModified(new Date());//记录修改时间
-                this.update(strTransferOutNote,new QueryWrapper<StrTransferOutNote>()
-                        .eq("rec_id", strTransferOutNote.getRecId())
-                        .eq("hospital_id", strTransferOutNote.getHospitalId())
-                        .eq("behospital_code", strTransferOutNote.getBehospitalCode()));
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("转出记录",strTransferOutNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrTransferOutNote strTransferOutNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrTransferOutNote>()
-                .eq("rec_id", strTransferOutNote.getRecId())
-                .eq("hospital_id", strTransferOutNote.getHospitalId())
-                .eq("behospital_code", strTransferOutNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 0 - 87
src/main/java/com/diagbot/facade/data/AStrWardRecordFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.StrWardRecord;
-import com.diagbot.service.impl.StrWardRecordServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AStrWardRecordVO;
-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;
-
-@Component
-public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"strWardRecord");
-
-        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //查房记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        StrWardRecord strWardRecord=new StrWardRecord();
-        try {
-            AStrWardRecordVO strWardRecordVO=(AStrWardRecordVO) MapUtil.mapToObject(entityMap, AStrWardRecordVO.class);
-            BeanUtils.copyProperties(strWardRecordVO,strWardRecord);
-            strWardRecord.setHospitalId(hospitalId);//医院编码
-
-            strWardRecord.setAuditDate(DateUtil.parseDateTime(strWardRecordVO.getAuditDate()));//审核时间
-            strWardRecord.setRecDate(DateUtil.parseDateTime(strWardRecordVO.getRecDate()));//记录时间
-            strWardRecord.setWardDate(DateUtil.parseDateTime(strWardRecordVO.getWardDate()));//查房日期
-            strWardRecord.setRecordDate(DateUtil.parseDateTime(strWardRecordVO.getRecordDate()));//病历日期
-
-            strWardRecord.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if(isExist(strWardRecord)){
-                strWardRecord.setGmtCreate(new Date());//记录创建时间
-                this.save(strWardRecord);
-            }else{
-                strWardRecord.setGmtModified(new Date());//记录修改时间
-                this.update(strWardRecord,new QueryWrapper<StrWardRecord>()
-                        .eq("rec_id", strWardRecord.getRecId())
-                        .eq("hospital_id", strWardRecord.getHospitalId())
-                        .eq("behospital_code", strWardRecord.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("查房记录", strWardRecord.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(StrWardRecord strWardRecord){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<StrWardRecord>()
-                .eq("rec_id", strWardRecord.getRecId())
-                .eq("hospital_id", strWardRecord.getHospitalId())
-                .eq("behospital_code", strWardRecord.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

+ 117 - 55
src/main/java/com/diagbot/facade/data/ColumnFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.Response;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.QcClientFacade;
+import com.diagbot.facade.str.*;
 import com.diagbot.service.impl.ColumnServiceImpl;
 import com.diagbot.vo.QueryVo;
 import com.diagbot.vo.str.StrContentVO;
@@ -30,7 +31,7 @@ public class ColumnFacade extends ColumnServiceImpl {
      * 解析
      * @param queryVo
      */
-    public void analyseRec(QueryVo queryVo){
+    public void analyseRec(QueryVo queryVo) {
         try {
             Response<OutputInfo> resp=qcClientFacade.analyseField(queryVo);
             if(resp.getData()!=null && resp.getData().getPageData()!=null){
@@ -61,7 +62,7 @@ public class ColumnFacade extends ColumnServiceImpl {
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public void analyseWholeData(StrContentVO strContentVO){
+    public void analyseWholeData(StrContentVO strContentVO) throws Exception{
         //调用解析接口
         Response<OutputInfo> resp=null;
         //qcClientFacade.analyseField(queryVo);
@@ -84,106 +85,167 @@ public class ColumnFacade extends ColumnServiceImpl {
     }
 
     /**
-     * 数据解析
-     * @param modelName
-     * @param entityMap
-     * @param hospitalId
-     */
-    private void analysisData(String modelName,Map<String, Object> entityMap,Long hospitalId,String columnMap){
+     * @Description: 不解析时,先入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void addWholeData(StrContentVO strContentVO){
+        String modelName=ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId()));
         if("入院记录".equals(modelName)){
-            aStrAdmissionNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrAdmissionNoteFacade.dealData(strContentVO);
         }else if("首次病程录".equals(modelName)){
-            aStrFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrFirstRecordFacade.dealData(strContentVO);
         }else if("输血后效果评价".equals(modelName)){
-            aStrBloodResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrBloodResultFacade.dealData(strContentVO);
         }else if("输血/血制品病程记录".equals(modelName)){
-            aStrBloodTransfusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrBloodTransfusionFacade.dealData(strContentVO);
         }else if("转入记录".equals(modelName)){
-            aStrTransferInNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrTransferInNoteFacade.dealData(strContentVO);
         }else if("转出记录".equals(modelName)){
-            aStrTransferOutNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrTransferOutNoteFacade.dealData(strContentVO);
         }else if("病危通知书".equals(modelName)){
-            aStrIllCriticallyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrIllCriticallyFacade.dealData(strContentVO);
         }else if("病重通知书".equals(modelName)){
-            aStrIllSeriouslFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrIllSeriouslFacade.dealData(strContentVO);
         }else if("疑难病例讨论记录".equals(modelName)){
-            aStrDifficultCaseFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrDifficultCaseFacade.dealData(strContentVO);
         }else if("死亡记录".equals(modelName)){
-            aStrDeathNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrDeathNoteFacade.dealData(strContentVO);
         }else if("死亡病例讨论记录".equals(modelName)){
-            aStrDeathDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrDeathDiscussionFacade.dealData(strContentVO);
         }else if("查房记录".equals(modelName)){
-            aStrWardRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrWardRecordFacade.dealData(strContentVO);
         }else if("术后首次病程及谈话记录".equals(modelName)){
-            aStrOperativeFirstRecord.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrOperativeFirstRecordFacade.dealData(strContentVO);
         }else if("术前讨论、术前小结".equals(modelName)){
-            aStrPreoperativeDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrPreoperativeDiscussionFacade.dealData(strContentVO);
         }else if("手术记录".equals(modelName)){
-            aStrOperativeNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrOperativeNoteFacade.dealData(strContentVO);
         }else if("抢救记录".equals(modelName)){
-            aStrRescueNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrRescueNoteFacade.dealData(strContentVO);
         }else if("危急值记录".equals(modelName)){
-            aStrCrisisNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrCrisisNoteFacade.dealData(strContentVO);
         }else if("出院小结".equals(modelName)){
-            aStrLeaveHospitalFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrLeaveHospitalFacade.dealData(strContentVO);
         }else if("会诊申请单".equals(modelName)){
-            aStrConsultationApplyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrConsultationApplyFacade.dealData(strContentVO);
         }else if("会诊结果单".equals(modelName)){
-            aStrConsultationResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrConsultationResultFacade.dealData(strContentVO);
         }else if("会诊单".equals(modelName)){
-            aStrConsultationNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrConsultationNoteFacade.dealData(strContentVO);
         }else if ("会诊记录".equals(modelName)){
-            aStrConsultationRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrConsultationRecordFacade.dealData(strContentVO);
         } else if("阶段小结".equals(modelName)){
-            aStrPeriodConclusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            bStrPeriodConclusionFacade.dealData(strContentVO);
+        }
+    }
+
+    /**
+     * 数据解析
+     * @param modelName
+     * @param entityMap
+     * @param hospitalId
+     */
+    private void analysisData(String modelName,Map<String, Object> entityMap,Long hospitalId,String columnMap){
+        try{
+            if("入院记录".equals(modelName)){
+                bStrAdmissionNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("首次病程录".equals(modelName)){
+                bStrFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("输血后效果评价".equals(modelName)){
+                bStrBloodResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("输血/血制品病程记录".equals(modelName)){
+                bStrBloodTransfusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("转入记录".equals(modelName)){
+                bStrTransferInNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("转出记录".equals(modelName)){
+                bStrTransferOutNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("病危通知书".equals(modelName)){
+                bStrIllCriticallyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("病重通知书".equals(modelName)){
+                bStrIllSeriouslFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("疑难病例讨论记录".equals(modelName)){
+                bStrDifficultCaseFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("死亡记录".equals(modelName)){
+                bStrDeathNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("死亡病例讨论记录".equals(modelName)){
+                bStrDeathDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("查房记录".equals(modelName)){
+                bStrWardRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("术后首次病程及谈话记录".equals(modelName)){
+                bStrOperativeFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("术前讨论、术前小结".equals(modelName)){
+                bStrPreoperativeDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("手术记录".equals(modelName)){
+                bStrOperativeNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("抢救记录".equals(modelName)){
+                bStrRescueNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("危急值记录".equals(modelName)){
+                bStrCrisisNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("出院小结".equals(modelName)){
+                bStrLeaveHospitalFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("会诊申请单".equals(modelName)){
+                bStrConsultationApplyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("会诊结果单".equals(modelName)){
+                bStrConsultationResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if("会诊单".equals(modelName)){
+                bStrConsultationNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }else if ("会诊记录".equals(modelName)){
+                bStrConsultationRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            } else if("阶段小结".equals(modelName)){
+                bStrPeriodConclusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+            }
+            log.info(modelName+"---- 解析完成!");
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析异常", "",JSON.toJSONString(columnMap),"",e.getMessage());
         }
-        log.info(modelName+"---- 解析完成!");
     }
 
     @Autowired
-    private AStrAdmissionNoteFacade aStrAdmissionNoteFacade;
+    private BStrAdmissionNoteFacade bStrAdmissionNoteFacade;
     @Autowired
-    private AStrFirstRecordFacade aStrFirstRecordFacade;
+    private BStrFirstRecordFacade bStrFirstRecordFacade;
     @Autowired
-    private AStrPeriodConclusionFacade aStrPeriodConclusionFacade;
+    private BStrPeriodConclusionFacade bStrPeriodConclusionFacade;
     @Autowired
-    private AStrBloodResultFacade aStrBloodResultFacade;
+    private BStrBloodResultFacade bStrBloodResultFacade;
     @Autowired
-    private AStrBloodTransfusionFacade aStrBloodTransfusionFacade;
+    private BStrBloodTransfusionFacade bStrBloodTransfusionFacade;
     @Autowired
-    private AStrTransferInNoteFacade aStrTransferInNoteFacade;
+    private BStrTransferInNoteFacade bStrTransferInNoteFacade;
     @Autowired
-    private AStrTransferOutNoteFacade aStrTransferOutNoteFacade;
+    private BStrTransferOutNoteFacade bStrTransferOutNoteFacade;
     @Autowired
-    private AStrIllSeriouslFacade aStrIllSeriouslFacade;
+    private BStrIllSeriouslFacade bStrIllSeriouslFacade;
     @Autowired
-    private AStrIllCriticallyFacade aStrIllCriticallyFacade;
+    private BStrIllCriticallyFacade bStrIllCriticallyFacade;
     @Autowired
-    private AStrDifficultCaseFacade aStrDifficultCaseFacade;
+    private BStrDifficultCaseFacade bStrDifficultCaseFacade;
     @Autowired
-    private AStrDeathNoteFacade aStrDeathNoteFacade;
+    private BStrDeathNoteFacade bStrDeathNoteFacade;
     @Autowired
-    private AStrDeathDiscussionFacade aStrDeathDiscussionFacade;
+    private BStrDeathDiscussionFacade bStrDeathDiscussionFacade;
     @Autowired
-    private AStrWardRecordFacade aStrWardRecordFacade;
+    private BStrWardRecordFacade bStrWardRecordFacade;
     @Autowired
-    private AStrOperativeFirstRecord aStrOperativeFirstRecord;
+    private BStrOperativeFirstRecordFacade bStrOperativeFirstRecordFacade;
     @Autowired
-    private AStrPreoperativeDiscussionFacade aStrPreoperativeDiscussionFacade;
+    private BStrPreoperativeDiscussionFacade bStrPreoperativeDiscussionFacade;
     @Autowired
-    private AStrOperativeNoteFacade aStrOperativeNoteFacade;
+    private BStrOperativeNoteFacade bStrOperativeNoteFacade;
     @Autowired
-    private AStrRescueNoteFacade aStrRescueNoteFacade;
+    private BStrRescueNoteFacade bStrRescueNoteFacade;
     @Autowired
-    private AStrCrisisNoteFacade aStrCrisisNoteFacade;
+    private BStrCrisisNoteFacade bStrCrisisNoteFacade;
     @Autowired
-    private AStrLeaveHospitalFacade aStrLeaveHospitalFacade;
+    private BStrLeaveHospitalFacade bStrLeaveHospitalFacade;
     @Autowired
-    private AStrConsultationApplyFacade aStrConsultationApplyFacade;
+    private BStrConsultationApplyFacade bStrConsultationApplyFacade;
     @Autowired
-    private AStrConsultationResultFacade aStrConsultationResultFacade;
+    private BStrConsultationResultFacade bStrConsultationResultFacade;
     @Autowired
-    private AStrConsultationNoteFacade aStrConsultationNoteFacade;
+    private BStrConsultationNoteFacade bStrConsultationNoteFacade;
     @Autowired
-    private AStrConsultationRecordFacade aStrConsultationRecordFacade;
+    private BStrConsultationRecordFacade bStrConsultationRecordFacade;
 }

+ 51 - 28
src/main/java/com/diagbot/facade/str/BStrAdmissionNoteFacade.java

@@ -17,6 +17,7 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrAdmissionNoteVO;
 import com.diagbot.vo.str.StrAdmissionNoteVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,36 +57,58 @@ public class BStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
             return;
         }
     }
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrAdmissionNote strAdmissionNote = new StrAdmissionNote();
+        strAdmissionNote.setRecId(strContentVO.getRecId());
+        strAdmissionNote.setBehospitalCode(strContentVO.getBehospitalCode());
+        strAdmissionNote.setHospitalId(strAdmissionNote.getHospitalId());
+        strAdmissionNote.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strAdmissionNote)) {
+            strAdmissionNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strAdmissionNote);
+        } else {
+            strAdmissionNote.setGmtModified(new Date());//记录修改时间
+            this.update(strAdmissionNote, new QueryWrapper<StrAdmissionNote>()
+                    .eq("rec_id", strAdmissionNote.getRecId())
+                    .eq("hospital_id", strAdmissionNote.getHospitalId())
+                    .eq("behospital_code", strAdmissionNote.getBehospitalCode()));
+        }
+    }
 
-    //入院记录
-    public void dealData(String columnMap, Map<String, Object> entityMap, Long hospitalId) {
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(String columnMap, Map<String, Object> entityMap, Long hospitalId) throws Exception {
         StrAdmissionNote strAdmissionNote = new StrAdmissionNote();
-        try {
-            AStrAdmissionNoteVO strAdmissionNoteVO = (AStrAdmissionNoteVO) MapUtil.mapToObject(entityMap, AStrAdmissionNoteVO.class);
-            BeanUtils.copyProperties(strAdmissionNoteVO, strAdmissionNote);
-            strAdmissionNote.setHospitalId(hospitalId);//医院编码
-
-            strAdmissionNote.setAuditDate(DateUtil.parseDateTime(strAdmissionNoteVO.getAuditDate()));//审核时间
-            strAdmissionNote.setRecDate(DateUtil.parseDateTime(strAdmissionNoteVO.getRecDate()));//记录时间
-            strAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(strAdmissionNoteVO.getBehospitalDate()));//入院日期
-            strAdmissionNote.setBirthday(DateUtil.parseDate(strAdmissionNoteVO.getBirthday()));//出生日期
-            strAdmissionNote.setRecordDate(DateUtil.parseDateTime(strAdmissionNoteVO.getRecordDate()));//病历日期
-
-            strAdmissionNote.setWholeData(columnMap);
-            //判断数据库中是否存在,不存在insert
-            if (isExist(strAdmissionNote)) {
-                strAdmissionNote.setGmtCreate(new Date());//记录创建时间
-                this.save(strAdmissionNote);
-            } else {
-                strAdmissionNote.setGmtModified(new Date());//记录修改时间
-                this.update(strAdmissionNote, new QueryWrapper<StrAdmissionNote>()
-                        .eq("rec_id", strAdmissionNote.getRecId())
-                        .eq("hospital_id", strAdmissionNote.getHospitalId())
-                        .eq("behospital_code", strAdmissionNote.getBehospitalCode()));
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录", strAdmissionNote.getRecId(), JSON.toJSONString(entityMap), "", e.getMessage());
+        AStrAdmissionNoteVO strAdmissionNoteVO = (AStrAdmissionNoteVO) MapUtil.mapToObject(entityMap, AStrAdmissionNoteVO.class);
+        BeanUtils.copyProperties(strAdmissionNoteVO, strAdmissionNote);
+        strAdmissionNote.setHospitalId(hospitalId);//医院编码
+
+        strAdmissionNote.setAuditDate(DateUtil.parseDateTime(strAdmissionNoteVO.getAuditDate()));//审核时间
+        strAdmissionNote.setRecDate(DateUtil.parseDateTime(strAdmissionNoteVO.getRecDate()));//记录时间
+        strAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(strAdmissionNoteVO.getBehospitalDate()));//入院日期
+        strAdmissionNote.setBirthday(DateUtil.parseDate(strAdmissionNoteVO.getBirthday()));//出生日期
+        strAdmissionNote.setRecordDate(DateUtil.parseDateTime(strAdmissionNoteVO.getRecordDate()));//病历日期
+
+        strAdmissionNote.setWholeData(columnMap);
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strAdmissionNote)) {
+            strAdmissionNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strAdmissionNote);
+        } else {
+            strAdmissionNote.setGmtModified(new Date());//记录修改时间
+            this.update(strAdmissionNote, new QueryWrapper<StrAdmissionNote>()
+                    .eq("rec_id", strAdmissionNote.getRecId())
+                    .eq("hospital_id", strAdmissionNote.getHospitalId())
+                    .eq("behospital_code", strAdmissionNote.getBehospitalCode()));
         }
     }
 

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrBloodResultFacade.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.entity.StrBloodResult;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
@@ -17,6 +18,7 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrBloodResultVO;
 import com.diagbot.vo.str.StrBloodResultVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +61,35 @@ public class BStrBloodResultFacade extends StrBloodResultServiceImpl {
         //Map<String, String> map=columnFacade.getColumn("strBloodResult");
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrBloodResult strBloodResult=new StrBloodResult();
+        strBloodResult.setRecId(strContentVO.getRecId());
+        strBloodResult.setBehospitalCode(strContentVO.getBehospitalCode());
+        strBloodResult.setHospitalId(strBloodResult.getHospitalId());
+        strBloodResult.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strBloodResult)) {
+            strBloodResult.setGmtCreate(new Date());//记录创建时间
+            this.save(strBloodResult);
+        } else {
+            strBloodResult.setGmtModified(new Date());//记录修改时间
+            this.update(strBloodResult, new QueryWrapper<StrBloodResult>()
+                    .eq("rec_id", strBloodResult.getRecId())
+                    .eq("hospital_id", strBloodResult.getHospitalId())
+                    .eq("behospital_code", strBloodResult.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrBloodResult strBloodResult=new StrBloodResult();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrBloodTransfusionFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrBloodTransfusion;
+import com.diagbot.entity.StrBloodTransfusion;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -17,6 +18,7 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrBloodTransfusionVO;
 import com.diagbot.vo.str.StrBloodTransfusionVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +63,35 @@ public class BStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrBloodTransfusion strBloodTransfusion=new StrBloodTransfusion();
+        strBloodTransfusion.setRecId(strContentVO.getRecId());
+        strBloodTransfusion.setBehospitalCode(strContentVO.getBehospitalCode());
+        strBloodTransfusion.setHospitalId(strBloodTransfusion.getHospitalId());
+        strBloodTransfusion.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strBloodTransfusion)) {
+            strBloodTransfusion.setGmtCreate(new Date());//记录创建时间
+            this.save(strBloodTransfusion);
+        } else {
+            strBloodTransfusion.setGmtModified(new Date());//记录修改时间
+            this.update(strBloodTransfusion, new QueryWrapper<StrBloodTransfusion>()
+                    .eq("rec_id", strBloodTransfusion.getRecId())
+                    .eq("hospital_id", strBloodTransfusion.getHospitalId())
+                    .eq("behospital_code", strBloodTransfusion.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrBloodTransfusion strBloodTransfusion=new StrBloodTransfusion();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrConsultationApplyFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationApply;
+import com.diagbot.entity.StrConsultationApply;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -17,6 +18,7 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrConsultationApplyVO;
 import com.diagbot.vo.str.StrConsultationApplyVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +58,35 @@ public class BStrConsultationApplyFacade extends StrConsultationApplyServiceImpl
         }
     }
 
-    //会诊申请单
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrConsultationApply strConsultationApply=new StrConsultationApply();
+        strConsultationApply.setRecId(strContentVO.getRecId());
+        strConsultationApply.setBehospitalCode(strContentVO.getBehospitalCode());
+        strConsultationApply.setHospitalId(strConsultationApply.getHospitalId());
+        strConsultationApply.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strConsultationApply)) {
+            strConsultationApply.setGmtCreate(new Date());//记录创建时间
+            this.save(strConsultationApply);
+        } else {
+            strConsultationApply.setGmtModified(new Date());//记录修改时间
+            this.update(strConsultationApply, new QueryWrapper<StrConsultationApply>()
+                    .eq("rec_id", strConsultationApply.getRecId())
+                    .eq("hospital_id", strConsultationApply.getHospitalId())
+                    .eq("behospital_code", strConsultationApply.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrConsultationApply strConsultationApply=new StrConsultationApply();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrConsultationNoteFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationNote;
+import com.diagbot.entity.StrConsultationNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -17,6 +18,7 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrConsultationNoteVO;
 import com.diagbot.vo.str.StrConsultationNoteVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +58,35 @@ public class BStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
         }
     }
 
-    //会诊单(申请和结果)
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrConsultationNote strConsultationNote=new StrConsultationNote();
+        strConsultationNote.setRecId(strContentVO.getRecId());
+        strConsultationNote.setBehospitalCode(strContentVO.getBehospitalCode());
+        strConsultationNote.setHospitalId(strConsultationNote.getHospitalId());
+        strConsultationNote.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strConsultationNote)) {
+            strConsultationNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strConsultationNote);
+        } else {
+            strConsultationNote.setGmtModified(new Date());//记录修改时间
+            this.update(strConsultationNote, new QueryWrapper<StrConsultationNote>()
+                    .eq("rec_id", strConsultationNote.getRecId())
+                    .eq("hospital_id", strConsultationNote.getHospitalId())
+                    .eq("behospital_code", strConsultationNote.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrConsultationNote strConsultationNote=new StrConsultationNote();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrConsultationRecordFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationRecord;
+import com.diagbot.entity.StrConsultationRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -17,6 +18,7 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.AStrConsultationRecordVO;
 import com.diagbot.vo.str.StrConsultationRecordVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +57,35 @@ public class BStrConsultationRecordFacade extends StrConsultationRecordServiceIm
         }
     }
 
-    //会诊记录
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrConsultationRecord strConsultationRecord=new StrConsultationRecord();
+        strConsultationRecord.setRecId(strContentVO.getRecId());
+        strConsultationRecord.setBehospitalCode(strContentVO.getBehospitalCode());
+        strConsultationRecord.setHospitalId(strConsultationRecord.getHospitalId());
+        strConsultationRecord.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strConsultationRecord)) {
+            strConsultationRecord.setGmtCreate(new Date());//记录创建时间
+            this.save(strConsultationRecord);
+        } else {
+            strConsultationRecord.setGmtModified(new Date());//记录修改时间
+            this.update(strConsultationRecord, new QueryWrapper<StrConsultationRecord>()
+                    .eq("rec_id", strConsultationRecord.getRecId())
+                    .eq("hospital_id", strConsultationRecord.getHospitalId())
+                    .eq("behospital_code", strConsultationRecord.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrConsultationRecord strConsultationRecord=new StrConsultationRecord();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrConsultationResultFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationResult;
+import com.diagbot.entity.StrConsultationResult;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -17,6 +18,7 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrConsultationResultVO;
 import com.diagbot.vo.str.StrConsultationResultVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +63,35 @@ public class BStrConsultationResultFacade extends StrConsultationResultServiceIm
         }
     }
 
-    //会诊结果单
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrConsultationResult strConsultationResult=new StrConsultationResult();
+        strConsultationResult.setRecId(strContentVO.getRecId());
+        strConsultationResult.setBehospitalCode(strContentVO.getBehospitalCode());
+        strConsultationResult.setHospitalId(strConsultationResult.getHospitalId());
+        strConsultationResult.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strConsultationResult)) {
+            strConsultationResult.setGmtCreate(new Date());//记录创建时间
+            this.save(strConsultationResult);
+        } else {
+            strConsultationResult.setGmtModified(new Date());//记录修改时间
+            this.update(strConsultationResult, new QueryWrapper<StrConsultationResult>()
+                    .eq("rec_id", strConsultationResult.getRecId())
+                    .eq("hospital_id", strConsultationResult.getHospitalId())
+                    .eq("behospital_code", strConsultationResult.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrConsultationResult strConsultationResult=new StrConsultationResult();
         try {

+ 11 - 1
src/main/java/com/diagbot/facade/str/BStrContentFacade.java

@@ -28,6 +28,9 @@ public class BStrContentFacade {
     @Value("${log_switch.enable}")
     private boolean logSwitch;
 
+    @Value("${xml_analyse.enable}")
+    private boolean xmlAnalyse;
+
     public RespDTO execDealData(StrContentVO strContentVO){
         try{
             if("".equals(strContentVO.getModelId())){
@@ -39,7 +42,14 @@ public class BStrContentFacade {
             }else if("".equals(strContentVO.getBehospitalCode())){
                 return RespDTO.onError("请输入病人住院编码!");
             }else{
-                columnFacade.analyseWholeData(strContentVO);
+                //是否进行xml、html、json解析为标准结构化
+                if(xmlAnalyse){
+                    //解析时,调用解析接口
+                    columnFacade.analyseWholeData(strContentVO);
+                }else{
+                    //不解析时,只存储入库
+                    columnFacade.addWholeData(strContentVO);
+                }
 
                 if(logSwitch){
                     aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-文书-正常", strContentVO.getRecId(), JSON.toJSONString(strContentVO), "", ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId())));

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrCrisisNoteFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrCrisisNote;
+import com.diagbot.entity.StrCrisisNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrCrisisNoteVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrCrisisNoteVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -55,6 +57,35 @@ public class BStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrCrisisNote strCrisisNote=new StrCrisisNote();
+        strCrisisNote.setRecId(strContentVO.getRecId());
+        strCrisisNote.setBehospitalCode(strContentVO.getBehospitalCode());
+        strCrisisNote.setHospitalId(strCrisisNote.getHospitalId());
+        strCrisisNote.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strCrisisNote)) {
+            strCrisisNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strCrisisNote);
+        } else {
+            strCrisisNote.setGmtModified(new Date());//记录修改时间
+            this.update(strCrisisNote, new QueryWrapper<StrCrisisNote>()
+                    .eq("rec_id", strCrisisNote.getRecId())
+                    .eq("hospital_id", strCrisisNote.getHospitalId())
+                    .eq("behospital_code", strCrisisNote.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrCrisisNote strCrisisNote=new StrCrisisNote();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrDeathDiscussionFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrDeathDiscussion;
+import com.diagbot.entity.StrDeathDiscussion;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrDeathDiscussionVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrDeathDiscussionVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -55,7 +57,35 @@ public class BStrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
         }
     }
 
-    //死亡病例讨论记录
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrDeathDiscussion strDeathDiscussion=new StrDeathDiscussion();
+        strDeathDiscussion.setRecId(strContentVO.getRecId());
+        strDeathDiscussion.setBehospitalCode(strContentVO.getBehospitalCode());
+        strDeathDiscussion.setHospitalId(strDeathDiscussion.getHospitalId());
+        strDeathDiscussion.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strDeathDiscussion)) {
+            strDeathDiscussion.setGmtCreate(new Date());//记录创建时间
+            this.save(strDeathDiscussion);
+        } else {
+            strDeathDiscussion.setGmtModified(new Date());//记录修改时间
+            this.update(strDeathDiscussion, new QueryWrapper<StrDeathDiscussion>()
+                    .eq("rec_id", strDeathDiscussion.getRecId())
+                    .eq("hospital_id", strDeathDiscussion.getHospitalId())
+                    .eq("behospital_code", strDeathDiscussion.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrDeathDiscussion strDeathDiscussion=new StrDeathDiscussion();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrDeathNoteFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrDeathNote;
+import com.diagbot.entity.StrDeathNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrDeathNoteVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrDeathNoteVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,7 +58,35 @@ public class BStrDeathNoteFacade extends StrDeathNoteServiceImpl {
         }
     }
 
-    //死亡记录
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrDeathNote strDeathNote=new StrDeathNote();
+        strDeathNote.setRecId(strContentVO.getRecId());
+        strDeathNote.setBehospitalCode(strContentVO.getBehospitalCode());
+        strDeathNote.setHospitalId(strDeathNote.getHospitalId());
+        strDeathNote.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strDeathNote)) {
+            strDeathNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strDeathNote);
+        } else {
+            strDeathNote.setGmtModified(new Date());//记录修改时间
+            this.update(strDeathNote, new QueryWrapper<StrDeathNote>()
+                    .eq("rec_id", strDeathNote.getRecId())
+                    .eq("hospital_id", strDeathNote.getHospitalId())
+                    .eq("behospital_code", strDeathNote.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrDeathNote strDeathNote=new StrDeathNote();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrDifficultCaseFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrDifficultCase;
+import com.diagbot.entity.StrDifficultCase;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrDifficultCaseVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrDifficultCaseVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,35 @@ public class BStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrDifficultCase medDifficult=new StrDifficultCase();
+        medDifficult.setRecId(strContentVO.getRecId());
+        medDifficult.setBehospitalCode(strContentVO.getBehospitalCode());
+        medDifficult.setHospitalId(medDifficult.getHospitalId());
+        medDifficult.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(medDifficult)) {
+            medDifficult.setGmtCreate(new Date());//记录创建时间
+            this.save(medDifficult);
+        } else {
+            medDifficult.setGmtModified(new Date());//记录修改时间
+            this.update(medDifficult, new QueryWrapper<StrDifficultCase>()
+                    .eq("rec_id", medDifficult.getRecId())
+                    .eq("hospital_id", medDifficult.getHospitalId())
+                    .eq("behospital_code", medDifficult.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrDifficultCase medDifficult=new StrDifficultCase();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrFirstRecordFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrFirstRecord;
+import com.diagbot.entity.StrFirstRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrFirstRecordVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrFirstRecordVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,35 @@ public class BStrFirstRecordFacade extends StrFirstRecordServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrFirstRecord medDifficult=new StrFirstRecord();
+        medDifficult.setRecId(strContentVO.getRecId());
+        medDifficult.setBehospitalCode(strContentVO.getBehospitalCode());
+        medDifficult.setHospitalId(medDifficult.getHospitalId());
+        medDifficult.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(medDifficult)) {
+            medDifficult.setGmtCreate(new Date());//记录创建时间
+            this.save(medDifficult);
+        } else {
+            medDifficult.setGmtModified(new Date());//记录修改时间
+            this.update(medDifficult, new QueryWrapper<StrFirstRecord>()
+                    .eq("rec_id", medDifficult.getRecId())
+                    .eq("hospital_id", medDifficult.getHospitalId())
+                    .eq("behospital_code", medDifficult.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrFirstRecord strFirstRecord=new StrFirstRecord();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrIllCriticallyFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrIllCritically;
+import com.diagbot.entity.StrIllCritically;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrIllCriticallyVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrIllCriticallyVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,35 @@ public class BStrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrIllCritically strIllCritically=new StrIllCritically();
+        strIllCritically.setRecId(strContentVO.getRecId());
+        strIllCritically.setBehospitalCode(strContentVO.getBehospitalCode());
+        strIllCritically.setHospitalId(strIllCritically.getHospitalId());
+        strIllCritically.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strIllCritically)) {
+            strIllCritically.setGmtCreate(new Date());//记录创建时间
+            this.save(strIllCritically);
+        } else {
+            strIllCritically.setGmtModified(new Date());//记录修改时间
+            this.update(strIllCritically, new QueryWrapper<StrIllCritically>()
+                    .eq("rec_id", strIllCritically.getRecId())
+                    .eq("hospital_id", strIllCritically.getHospitalId())
+                    .eq("behospital_code", strIllCritically.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrIllCritically strIllCritically=new StrIllCritically();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrIllSeriouslFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrIllSeriousl;
+import com.diagbot.entity.StrIllSeriousl;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrIllSeriouslVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrIllSeriouslVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,35 @@ public class BStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrIllSeriousl strIllSeriousl=new StrIllSeriousl();
+        strIllSeriousl.setRecId(strContentVO.getRecId());
+        strIllSeriousl.setBehospitalCode(strContentVO.getBehospitalCode());
+        strIllSeriousl.setHospitalId(strIllSeriousl.getHospitalId());
+        strIllSeriousl.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strIllSeriousl)) {
+            strIllSeriousl.setGmtCreate(new Date());//记录创建时间
+            this.save(strIllSeriousl);
+        } else {
+            strIllSeriousl.setGmtModified(new Date());//记录修改时间
+            this.update(strIllSeriousl, new QueryWrapper<StrIllSeriousl>()
+                    .eq("rec_id", strIllSeriousl.getRecId())
+                    .eq("hospital_id", strIllSeriousl.getHospitalId())
+                    .eq("behospital_code", strIllSeriousl.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrIllSeriousl strIllSeriousl=new StrIllSeriousl();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrInformedConsentFacade.java

@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrInformedConsent;
+import com.diagbot.entity.StrInformedConsent;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrInformedConsentServiceImpl;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrInformedConsentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -49,6 +51,35 @@ public class BStrInformedConsentFacade extends StrInformedConsentServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrInformedConsent strInformedConsent=new StrInformedConsent();
+        strInformedConsent.setRecId(strContentVO.getRecId());
+        strInformedConsent.setBehospitalCode(strContentVO.getBehospitalCode());
+        strInformedConsent.setHospitalId(strInformedConsent.getHospitalId());
+        //strInformedConsent.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strInformedConsent)) {
+            strInformedConsent.setGmtCreate(new Date());//记录创建时间
+            this.save(strInformedConsent);
+        } else {
+            strInformedConsent.setGmtModified(new Date());//记录修改时间
+            this.update(strInformedConsent, new QueryWrapper<StrInformedConsent>()
+                    .eq("rec_id", strInformedConsent.getRecId())
+                    .eq("hospital_id", strInformedConsent.getHospitalId())
+                    .eq("behospital_code", strInformedConsent.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrInformedConsent strInformedConsent=new StrInformedConsent();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrLeaveHospitalFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrLeaveHospital;
+import com.diagbot.entity.StrLeaveHospital;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrLeaveHospitalVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrLeaveHospitalVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,7 +58,35 @@ public class BStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
         }
     }
 
-    //危急值记录
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrLeaveHospital strLeaveHospital=new StrLeaveHospital();
+        strLeaveHospital.setRecId(strContentVO.getRecId());
+        strLeaveHospital.setBehospitalCode(strContentVO.getBehospitalCode());
+        strLeaveHospital.setHospitalId(strLeaveHospital.getHospitalId());
+        strLeaveHospital.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strLeaveHospital)) {
+            strLeaveHospital.setGmtCreate(new Date());//记录创建时间
+            this.save(strLeaveHospital);
+        } else {
+            strLeaveHospital.setGmtModified(new Date());//记录修改时间
+            this.update(strLeaveHospital, new QueryWrapper<StrLeaveHospital>()
+                    .eq("rec_id", strLeaveHospital.getRecId())
+                    .eq("hospital_id", strLeaveHospital.getHospitalId())
+                    .eq("behospital_code", strLeaveHospital.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrLeaveHospital strLeaveHospital=new StrLeaveHospital();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrOperativeFirstRecordFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrOperativeFirstRecord;
+import com.diagbot.entity.StrOperativeFirstRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrOperativeFirstRecordVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrOperativeFirstRecordVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -55,7 +57,35 @@ public class BStrOperativeFirstRecordFacade extends StrOperativeFirstRecordServi
         }
     }
 
-    //术后首程
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrOperativeFirstRecord strOperativeFirstRecord=new StrOperativeFirstRecord();
+        strOperativeFirstRecord.setRecId(strContentVO.getRecId());
+        strOperativeFirstRecord.setBehospitalCode(strContentVO.getBehospitalCode());
+        strOperativeFirstRecord.setHospitalId(strOperativeFirstRecord.getHospitalId());
+        strOperativeFirstRecord.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strOperativeFirstRecord)) {
+            strOperativeFirstRecord.setGmtCreate(new Date());//记录创建时间
+            this.save(strOperativeFirstRecord);
+        } else {
+            strOperativeFirstRecord.setGmtModified(new Date());//记录修改时间
+            this.update(strOperativeFirstRecord, new QueryWrapper<StrOperativeFirstRecord>()
+                    .eq("rec_id", strOperativeFirstRecord.getRecId())
+                    .eq("hospital_id", strOperativeFirstRecord.getHospitalId())
+                    .eq("behospital_code", strOperativeFirstRecord.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrOperativeFirstRecord strOperativeFirstRecord=new StrOperativeFirstRecord();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrOperativeNoteFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrOperativeNote;
+import com.diagbot.entity.StrOperativeNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrOperativeNoteVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrOperativeNoteVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,7 +58,35 @@ public class BStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
         }
     }
 
-    //手术记录
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrOperativeNote strOperativeNote=new StrOperativeNote();
+        strOperativeNote.setRecId(strContentVO.getRecId());
+        strOperativeNote.setBehospitalCode(strContentVO.getBehospitalCode());
+        strOperativeNote.setHospitalId(strOperativeNote.getHospitalId());
+        strOperativeNote.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strOperativeNote)) {
+            strOperativeNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strOperativeNote);
+        } else {
+            strOperativeNote.setGmtModified(new Date());//记录修改时间
+            this.update(strOperativeNote, new QueryWrapper<StrOperativeNote>()
+                    .eq("rec_id", strOperativeNote.getRecId())
+                    .eq("hospital_id", strOperativeNote.getHospitalId())
+                    .eq("behospital_code", strOperativeNote.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrOperativeNote strOperativeNote=new StrOperativeNote();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrPeriodConclusionFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrPeriodConclusion;
+import com.diagbot.entity.StrPeriodConclusion;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrPeriodConclusionVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrPeriodConclusionVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,35 @@ public class BStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrPeriodConclusion strPeriodConclusion=new StrPeriodConclusion();
+        strPeriodConclusion.setRecId(strContentVO.getRecId());
+        strPeriodConclusion.setBehospitalCode(strContentVO.getBehospitalCode());
+        strPeriodConclusion.setHospitalId(strPeriodConclusion.getHospitalId());
+        strPeriodConclusion.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strPeriodConclusion)) {
+            strPeriodConclusion.setGmtCreate(new Date());//记录创建时间
+            this.save(strPeriodConclusion);
+        } else {
+            strPeriodConclusion.setGmtModified(new Date());//记录修改时间
+            this.update(strPeriodConclusion, new QueryWrapper<StrPeriodConclusion>()
+                    .eq("rec_id", strPeriodConclusion.getRecId())
+                    .eq("hospital_id", strPeriodConclusion.getHospitalId())
+                    .eq("behospital_code", strPeriodConclusion.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrPeriodConclusion strPeriodConclusion=new StrPeriodConclusion();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrPreoperativeDiscussionFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrPreoperativeDiscussion;
+import com.diagbot.entity.StrPreoperativeDiscussion;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrPreoperativeDiscussionVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrPreoperativeDiscussionVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,7 +58,35 @@ public class BStrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionS
         }
     }
 
-    //入院记录
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrPreoperativeDiscussion strPreoperativeDiscussion=new StrPreoperativeDiscussion();
+        strPreoperativeDiscussion.setRecId(strContentVO.getRecId());
+        strPreoperativeDiscussion.setBehospitalCode(strContentVO.getBehospitalCode());
+        strPreoperativeDiscussion.setHospitalId(strPreoperativeDiscussion.getHospitalId());
+        strPreoperativeDiscussion.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strPreoperativeDiscussion)) {
+            strPreoperativeDiscussion.setGmtCreate(new Date());//记录创建时间
+            this.save(strPreoperativeDiscussion);
+        } else {
+            strPreoperativeDiscussion.setGmtModified(new Date());//记录修改时间
+            this.update(strPreoperativeDiscussion, new QueryWrapper<StrPreoperativeDiscussion>()
+                    .eq("rec_id", strPreoperativeDiscussion.getRecId())
+                    .eq("hospital_id", strPreoperativeDiscussion.getHospitalId())
+                    .eq("behospital_code", strPreoperativeDiscussion.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrPreoperativeDiscussion strPreoperativeDiscussion=new StrPreoperativeDiscussion();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrRescueNoteFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrRescueNote;
+import com.diagbot.entity.StrRescueNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrRescueNoteVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrRescueNoteVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,35 @@ public class BStrRescueNoteFacade extends StrRescueNoteServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrRescueNote strRescueNote=new StrRescueNote();
+        strRescueNote.setRecId(strContentVO.getRecId());
+        strRescueNote.setBehospitalCode(strContentVO.getBehospitalCode());
+        strRescueNote.setHospitalId(strRescueNote.getHospitalId());
+        strRescueNote.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strRescueNote)) {
+            strRescueNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strRescueNote);
+        } else {
+            strRescueNote.setGmtModified(new Date());//记录修改时间
+            this.update(strRescueNote, new QueryWrapper<StrRescueNote>()
+                    .eq("rec_id", strRescueNote.getRecId())
+                    .eq("hospital_id", strRescueNote.getHospitalId())
+                    .eq("behospital_code", strRescueNote.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrRescueNote strRescueNote=new StrRescueNote();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrTalkInformFacade.java

@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrTalkInform;
+import com.diagbot.entity.StrTalkInform;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrTalkInformServiceImpl;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrTalkInformVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -49,6 +51,35 @@ public class BStrTalkInformFacade extends StrTalkInformServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrTalkInform strTalkInform=new StrTalkInform();
+        strTalkInform.setRecId(strContentVO.getRecId());
+        strTalkInform.setBehospitalCode(strContentVO.getBehospitalCode());
+        strTalkInform.setHospitalId(strTalkInform.getHospitalId());
+        //strTalkInform.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strTalkInform)) {
+            strTalkInform.setGmtCreate(new Date());//记录创建时间
+            this.save(strTalkInform);
+        } else {
+            strTalkInform.setGmtModified(new Date());//记录修改时间
+            this.update(strTalkInform, new QueryWrapper<StrTalkInform>()
+                    .eq("rec_id", strTalkInform.getRecId())
+                    .eq("hospital_id", strTalkInform.getHospitalId())
+                    .eq("behospital_code", strTalkInform.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrTalkInform strTalkInform=new StrTalkInform();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrTransferInNoteFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrTransferInNote;
+import com.diagbot.entity.StrTransferInNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrTransferInNoteVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrTransferInNoteVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,35 @@ public class BStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrTransferInNote strTransferInNote=new StrTransferInNote();
+        strTransferInNote.setRecId(strContentVO.getRecId());
+        strTransferInNote.setBehospitalCode(strContentVO.getBehospitalCode());
+        strTransferInNote.setHospitalId(strTransferInNote.getHospitalId());
+        strTransferInNote.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strTransferInNote)) {
+            strTransferInNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strTransferInNote);
+        } else {
+            strTransferInNote.setGmtModified(new Date());//记录修改时间
+            this.update(strTransferInNote, new QueryWrapper<StrTransferInNote>()
+                    .eq("rec_id", strTransferInNote.getRecId())
+                    .eq("hospital_id", strTransferInNote.getHospitalId())
+                    .eq("behospital_code", strTransferInNote.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrTransferInNote strTransferInNote=new StrTransferInNote();
         try {

+ 31 - 0
src/main/java/com/diagbot/facade/str/BStrTransferOutNoteFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrTransferOutNote;
+import com.diagbot.entity.StrTransferOutNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrTransferOutNoteVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrTransferOutNoteVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,35 @@ public class BStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
         }
     }
 
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrTransferOutNote strTransferOutNote=new StrTransferOutNote();
+        strTransferOutNote.setRecId(strContentVO.getRecId());
+        strTransferOutNote.setBehospitalCode(strContentVO.getBehospitalCode());
+        strTransferOutNote.setHospitalId(strTransferOutNote.getHospitalId());
+        strTransferOutNote.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strTransferOutNote)) {
+            strTransferOutNote.setGmtCreate(new Date());//记录创建时间
+            this.save(strTransferOutNote);
+        } else {
+            strTransferOutNote.setGmtModified(new Date());//记录修改时间
+            this.update(strTransferOutNote, new QueryWrapper<StrTransferOutNote>()
+                    .eq("rec_id", strTransferOutNote.getRecId())
+                    .eq("hospital_id", strTransferOutNote.getHospitalId())
+                    .eq("behospital_code", strTransferOutNote.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrTransferOutNote strTransferOutNote=new StrTransferOutNote();
         try {

+ 31 - 1
src/main/java/com/diagbot/facade/str/BStrWardRecordFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrWardRecord;
+import com.diagbot.entity.StrWardRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
@@ -16,6 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.AStrWardRecordVO;
+import com.diagbot.vo.str.StrContentVO;
 import com.diagbot.vo.str.StrWardRecordVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -56,7 +58,35 @@ public class BStrWardRecordFacade extends StrWardRecordServiceImpl {
         }
     }
 
-    //查房记录
+    /**
+     * @Description:不解析时入库
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void dealData(StrContentVO strContentVO){
+        StrWardRecord strWardRecord=new StrWardRecord();
+        strWardRecord.setRecId(strContentVO.getRecId());
+        strWardRecord.setBehospitalCode(strContentVO.getBehospitalCode());
+        strWardRecord.setHospitalId(strWardRecord.getHospitalId());
+        strWardRecord.setWholeData(strContentVO.getWholeData());
+        //判断数据库中是否存在,不存在insert
+        if (isExist(strWardRecord)) {
+            strWardRecord.setGmtCreate(new Date());//记录创建时间
+            this.save(strWardRecord);
+        } else {
+            strWardRecord.setGmtModified(new Date());//记录修改时间
+            this.update(strWardRecord, new QueryWrapper<StrWardRecord>()
+                    .eq("rec_id", strWardRecord.getRecId())
+                    .eq("hospital_id", strWardRecord.getHospitalId())
+                    .eq("behospital_code", strWardRecord.getBehospitalCode()));
+        }
+    }
+
+    /**
+     * @Description:解析后存储数据
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrWardRecord strWardRecord=new StrWardRecord();
         try {