调整同步数据不一致的情况

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

@@ -60,11 +60,6 @@ public class MedicalRecord implements Serializable {
      */
     private String recTitle;
 
-    /**
-     * 模块id
-     */
-    private Long modeId;
-
     /**
      * 是否删除,N:未删除，Y:删除
      */

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

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.facade.databack.*;
+import com.diagbot.facade.data.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -37,48 +37,5 @@ public class DataFacade {
     private ADoctorAdviceFacade aDoctorAdviceFacade;
 
 
-    public void executeView(){
-        aBasDeptInfoFacade.executeDeptPast();//科室信息
 
-        aBasDoctorInfoFacade.executeDoctorPast();//医生信息
-
-        aHomePageFacade.executeHomePagePast();//病案首页
-
-        aHomeDiagnoseInfoFacade.executeHomeDiagnosePast();//病案首页诊断
-
-        aHomeOperationInfoFacade.executeHomeOperationPast();//病案首页手术
-
-        aMedRecordTypeFacade.executeMRTypePast();//模板类型
-
-        aMedicalRecordFacade.executeMrRecordPast();//病历
-
-        aMedicalRecordContentFacade.executeMrRecordContentPast();//病历内容
-
-        aBehospitalInfoFacade.executeBehospitalPast();//住院信息
-
-        aDoctorAdviceFacade.executeDoctorAdvicePast();//住院医嘱信息
-    }
-
-
-    public void executePort(){
-        aBasDeptInfoFacade.executeDeptPort();//科室信息
-
-        aBasDoctorInfoFacade.executeDoctorPort();//医生信息
-
-        aHomePageFacade.executeHomePagePort();//病案首页
-
-        aHomeDiagnoseInfoFacade.executeHomeDiagnosePort();//病案首页诊断
-
-        aHomeOperationInfoFacade.executeHomeOperationPort();//病案首页手术
-
-        aMedRecordTypeFacade.executeMRTypePort();//模板类型
-
-        aMedicalRecordFacade.executeMrRecordPort();//病历
-
-        aMedicalRecordContentFacade.executeMrRecordContentPort();//病历内容
-
-        aBehospitalInfoFacade.executeBehospitalPort();//住院信息
-
-        aDoctorAdviceFacade.executeDoctorAdvicePort();//住院医嘱信息
-    }
 }

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

@@ -29,7 +29,7 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
      * 同步前一天科室的信息
      */
     public void executeDept() {
-        String sql="select * from hi_deptinfo where cjcxrq>=dateadd(day,-1,getdate()) and cjcxrq<=getdate()";
+        String sql="select * from hi_deptinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
         List<BasDeptInfo> basDeptInfoList = tzDBConn.getDeptInfo(sql);
         execute(basDeptInfoList);
     }

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

@@ -45,7 +45,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
      */
     public void executeBehospital() {
         //String sql="select * from br_inpatientinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from br_inpatientinfo where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
+        String sql="select * from br_inpatientinfo where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
         List<BehospitalInfo> behospitalInfoList = tzDBConn.getBehospitalInfo(sql);
         execute(behospitalInfoList);
     }

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

@@ -32,7 +32,7 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
      */
     public void executeDoctorAdvice() {
         //String sql="select * from br_doctadvice where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from br_doctadvice where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
+        String sql="select * from br_doctadvice where BRZYID in (select BRZYID from br_inpatientinfo where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) and requestflag='1')";
         List<DoctorAdvice> doctorAdviceList = tzDBConn.getDoctorAdvice(sql);
         execute(doctorAdviceList);
     }

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

@@ -37,11 +37,6 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
         execute(homeDiagnoseList);
     }
 
-    public void executeHomeDiagnosePast() {
-        String sql="select * from br_recdiagnose where BASYID in (select BASYID from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate())";//今年的数据
-        List<HomeDiagnoseInfo> homeDiagnoseList = tzDBConn.getHomeDiagnose(sql);
-        execute(homeDiagnoseList);
-    }
     /**
      * 数据引擎-通过接口更新病案首页诊断
      * @param list

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

@@ -31,7 +31,7 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     public void executeHomeOperation() {
         //String sql="select * from br_recoperation where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
         //前一天数据
-        String sql="select * from br_recoperation where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
+        String sql="select * from br_recoperation where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
         List<HomeOperationInfo> homeOperationList = tzDBConn.getHomeOperation(sql);
         execute(homeOperationList);
     }

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

@@ -54,7 +54,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
     public void executeHomePage() {
         //String sql="select * from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
         //同步前一天的数据
-        String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
+        String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
         List<HomePage> homePageList = tzDBConn.getHomePage(sql);
         execute(homePageList);
     }

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

@@ -30,7 +30,8 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
      * 终末质控-同步前一天变更的模板类型
      */
     public void executeMRType() {
-        String sql="select * from ar_medirecclass where SFZFPB='1' and cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
+        //String sql="select * from ar_medirecclass where SFZFPB='1'";
+        String sql="select * from ar_medirecclass where SFZFPB='1' and cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
         List<MedRecordType> medRecordTypeList = tzDBConn.getMedicalRecordType(sql);
         execute(medRecordTypeList);
     }

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

@@ -29,7 +29,7 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
      */
     public void executeMrRecordContent() {
         //String sql="select * from mr_mrcontent  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select BLJLID,BLJLNR from mr_mrcontent  where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
+        String sql="select BLJLID,BLJLNR from mr_mrcontent  where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
         List<MedicalRecordContent> mrContentList = tzDBConn.getMedicalRecordContent(sql);
         execute(mrContentList);
     }

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

@@ -9,6 +9,7 @@ import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.ModelHospitalFacade;
 import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
+import com.diagbot.service.impl.QcAbnormalServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ReadProperties;
@@ -43,7 +44,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     private BehospitalInfoFacade behospitalInfoFacade;
 
     @Autowired
-    private QcAbnormalFacade qcAbnormalFacade;
+    @Qualifier("qcAbnormalServiceImpl")
+    private QcAbnormalServiceImpl qcAbnormalService;
 
     @Autowired
     private ReadProperties readProperties;
@@ -55,7 +57,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
      */
     public void executeMrRecord() {
         //String sql="select * from mr_medicalrecords  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from mr_medicalrecords  where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
+        String sql="select * from mr_medicalrecords  where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
         List<MedicalRecord> medicalRecordList = tzDBConn.getMedicalRecord(sql);
         execute(medicalRecordList);
     }
@@ -183,6 +185,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     public void execute(List<MedicalRecord> medicalRecordList){
         List<MedicalRecord> addE = Lists.newLinkedList();
         List<MedicalRecord> updateE = Lists.newLinkedList();
+        List<QcAbnormal> qcAbnormalList = Lists.newLinkedList();
         if (medicalRecordList != null && medicalRecordList.size() > 0) {
             medicalRecordList.stream().forEach(s -> {
                 //初始化mode_id
@@ -195,7 +198,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     qcAbnormal.setType(1);
                     qcAbnormal.setDescription(s.getRecTitle());
                     qcAbnormal.setGmtCreate(new Date());
-                    qcAbnormalFacade.save(qcAbnormal);
+                    qcAbnormalList.add(qcAbnormal);
                 }
                 s.setModeId(modeId);
                 //新增或修改
@@ -218,6 +221,9 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         if(updateE.size()>0){
             medicalRecordService.updateBatchByKey(updateE);
         }
+        if(qcAbnormalList.size()>0){
+            qcAbnormalService.saveBatch(qcAbnormalList);
+        }
     }
 
 

src/main/java/com/diagbot/facade/databack/ABasDeptInfoFacade.java

@@ -1,95 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.ABasDeptInfoDTO;
-import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.BasDeptInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.ABasDeptInfoVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class ABasDeptInfoFacade {
-    @Autowired
-    @Qualifier("basDeptInfoServiceImpl")
-    private BasDeptInfoServiceImpl basDeptInfoServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 同步前一天科室的信息
-     */
-    public void executeDept() {
-        String sql="select * from hi_deptinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<BasDeptInfo> basDeptInfoList = tzDBConn.getDeptInfo(sql);
-        execute(basDeptInfoList);
-    }
-
-    /**
-     * 同步历史数据
-     */
-    public void executeDeptPast(){
-        String sql="select * from hi_deptinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<BasDeptInfo> basDeptInfoList = tzDBConn.getDeptInfo(sql);
-        execute(basDeptInfoList);
-    }
-
-    public void executeDeptPort(){
-
-    }
-
-    /**
-     * 通过接口同步数据
-     * @param list
-     * @return
-     */
-    public RespDTO<List<ABasDeptInfoDTO>> executeDept(List<ABasDeptInfoVO> list) {
-        if(list!=null && list.size()>0){
-            List<BasDeptInfo> basDeptInfoList=Lists.newArrayList();
-            List<ABasDeptInfoDTO> basDeptInfoDtoList=Lists.newArrayList();
-            basDeptInfoList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
-            basDeptInfoDtoList=BeanUtil.listCopyTo(list,ABasDeptInfoDTO.class);
-
-            //循环验证数据有效性
-            for (BasDeptInfo basDeptInfo:basDeptInfoList) {
-                if("".equals(basDeptInfo.getDeptId())) {
-                    return RespDTO.onError("请输入科室编码!");
-                }else if(basDeptInfo.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(basDeptInfo.getDeptName())){
-                    return RespDTO.onError("请输入科室名称!");
-                }
-            }
-            execute(basDeptInfoList);
-            return RespDTO.onSuc(basDeptInfoDtoList);
-        }else {
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<BasDeptInfo> basDeptInfoList){
-        basDeptInfoList.stream().forEach(s -> {
-            QueryWrapper<BasDeptInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.in("dept_id", s.getDeptId());
-            queryWrapper.eq("hospital_id", s.getHospitalId());
-            queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-            BasDeptInfo basDeptInfo = basDeptInfoServiceImpl.getOne(queryWrapper);
-            if (basDeptInfo != null) {
-                s.setGmtModified(new Date());
-                basDeptInfoServiceImpl.update(s,queryWrapper);
-            } else {
-                s.setGmtCreate(new Date());
-                basDeptInfoServiceImpl.save(s);
-            }
-        });
-    }
-}

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

@@ -1,92 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.ABasDoctorInfoDTO;
-import com.diagbot.entity.BasDoctorInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.ABasDoctorInfoVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class ABasDoctorInfoFacade {
-    @Autowired
-    @Qualifier("basDoctorInfoServiceImpl")
-    public BasDoctorInfoServiceImpl basDoctorInfoServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 同步历史数据
-     */
-    public void executeDoctorPast() {
-        String sql="select * from gi_userinfo";
-        List<BasDoctorInfo> basDeptInfoList = tzDBConn.getBasDoctorInfo(sql);
-        execute(basDeptInfoList);
-
-    }
-    /**
-     * 同步前一天医生信息
-     */
-    public void executeDoctor() {
-        String sql="select * from gi_userinfo";
-        List<BasDoctorInfo> basDeptInfoList = tzDBConn.getBasDoctorInfo(sql);
-        execute(basDeptInfoList);
-    }
-
-    public void executeDoctorPort(){
-
-    }
-
-    /**
-     * 从接口接收医生信息
-     * @param list
-     * @return
-     */
-    public RespDTO<List<ABasDoctorInfoDTO>> executeDoctor(List<ABasDoctorInfoVO> list) {
-        if(list!=null && list.size()>0){
-            List<BasDoctorInfo> basDoctorInfoList=Lists.newArrayList();
-            List<ABasDoctorInfoDTO> basDoctorDtoList=Lists.newArrayList();
-            basDoctorInfoList=BeanUtil.listCopyTo(list,BasDoctorInfo.class);
-            basDoctorDtoList=BeanUtil.listCopyTo(list,ABasDoctorInfoDTO.class);
-            //循环验证数据有效性
-            for (BasDoctorInfo basDoctorInfo:basDoctorInfoList) {
-                if("".equals(basDoctorInfo.getDoctorId())) {
-                    return RespDTO.onError("请输入医生编码!");
-                }else if(basDoctorInfo.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }
-            }
-            execute(basDoctorInfoList);
-            return RespDTO.onSuc(basDoctorDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<BasDoctorInfo> basDoctorInfoList){
-        basDoctorInfoList.stream().forEach(s -> {
-            QueryWrapper<BasDoctorInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("doctor_id", s.getDoctorId());
-            queryWrapper.eq("hospital_id", s.getHospitalId());
-            queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-            BasDoctorInfo basDoctorInfo = basDoctorInfoServiceImpl.getOne(queryWrapper);
-            if (basDoctorInfo != null) {
-                s.setGmtModified(new Date());
-                basDoctorInfoServiceImpl.update(s,queryWrapper);
-            } else {
-                s.setGmtCreate(new Date());
-                basDoctorInfoServiceImpl.save(s);
-            }
-        });
-    }
-}

src/main/java/com/diagbot/facade/databack/ABehospitalInfoFacade.java

@@ -1,147 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.ABehospitalInfoDTO;
-import com.diagbot.entity.*;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.QcAbnormalFacade;
-import com.diagbot.facade.QcTypeFacade;
-import com.diagbot.service.impl.BehospitalInfoServiceImpl;
-import com.diagbot.service.impl.MedicalRecordServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class ABehospitalInfoFacade {
-    @Autowired
-    @Qualifier("behospitalInfoServiceImpl")
-    private BehospitalInfoServiceImpl behospitalInfoServiceImpl;
-
-    @Autowired
-    private QcTypeFacade qcTypeFacade;
-
-    @Autowired
-    @Qualifier("medicalRecordServiceImpl")
-    private MedicalRecordServiceImpl medicalRecordServiceImpl;
-
-    @Autowired
-    private QcAbnormalFacade qcAbnormalFacade;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-同步前一天的入院记录
-     */
-    public void executeBehospital() {
-        //String sql="select * from br_inpatientinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from br_inpatientinfo where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        List<BehospitalInfo> behospitalInfoList = tzDBConn.getBehospitalInfo(sql);
-        execute(behospitalInfoList);
-    }
-
-    /**
-     * 同步前一天的入院记录
-     */
-    public void executeBehospitalPast() {
-        String sql="select * from br_inpatientinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<BehospitalInfo> behospitalInfoList = tzDBConn.getBehospitalInfo(sql);
-        execute(behospitalInfoList);
-    }
-
-    /**
-     * 通过接口更新病人住院记录信息
-     * @param list
-     * @return
-     */
-    public RespDTO<List<ABehospitalInfoDTO>> executeBehospital(List<ABehospitalInfoVO> list) {
-        if(list!=null && list.size()>0) {
-            List<BehospitalInfo> behospitalInfoList = Lists.newArrayList();
-            List<ABehospitalInfoDTO> behospitalInfoDtoList = Lists.newArrayList();
-            behospitalInfoList = BeanUtil.listCopyTo(list, BehospitalInfo.class);
-            behospitalInfoDtoList = BeanUtil.listCopyTo(list, ABehospitalInfoDTO.class);
-
-            //循环验证数据有效性
-            for (BehospitalInfo behospitalInfo:behospitalInfoList) {
-                if("".equals(behospitalInfo.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
-                }else if(behospitalInfo.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(behospitalInfo.getBehDeptId())){
-                    return RespDTO.onError("请输入住院科室编码!");
-                }else if("".equals(behospitalInfo.getBehDeptName())){
-                    return RespDTO.onError("请输入住院科室名称!");
-                }
-            }
-            execute(behospitalInfoList);
-            return RespDTO.onSuc(behospitalInfoDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void executeBehospitalPort(){
-
-    }
-
-    public void execute(List<BehospitalInfo> behospitalInfoList){
-        List<BehospitalInfo> add = Lists.newLinkedList();
-        List<BehospitalInfo> updateE = Lists.newLinkedList();
-        behospitalInfoList.stream().forEach(s -> {
-            QueryWrapper<MedicalRecord> wrapper = new QueryWrapper<>();
-            wrapper.eq("behospital_code", s.getBehospitalCode());
-            wrapper.eq("hospital_id", s.getHospitalId());
-            wrapper.eq("mode_id", Long.valueOf("1"));
-            MedicalRecord medicalRecord = medicalRecordServiceImpl.getOne(wrapper);
-            if(medicalRecord!=null){
-                QueryWrapper<QcType> qWrapper =new QueryWrapper<>();
-                qWrapper.eq("name",medicalRecord.getRecTitle());
-                qWrapper.eq("hospital_id", s.getHospitalId());
-                QcType qcType=qcTypeFacade.getOne(qWrapper);
-                if(qcType!=null){
-                    s.setQcTypeId(qcType.getId());
-                }else{
-                    //新增类型到qc_type表中
-                    QcType qctype=new QcType();
-                    qctype.setHospitalId(s.getHospitalId());
-                    qctype.setName(medicalRecord.getRecTitle());
-                    qctype.setRemark("台州");
-                    qctype.setGmtCreate(new Date());
-
-                    Long id=qcTypeFacade.saveT(qctype);
-                    s.setQcTypeId(id);
-
-                    //新增类型到监测表中
-                    QcAbnormal qcAbnormal=new QcAbnormal();
-                    qcAbnormal.setHospitalId(s.getHospitalId());
-                    qcAbnormal.setBehospitalCode(s.getBehospitalCode());
-                    qcAbnormal.setType(2);
-                    qcAbnormal.setDescription(medicalRecord.getRecTitle());
-                    qcAbnormal.setGmtCreate(new Date());
-                    qcAbnormalFacade.getBaseMapper().insert(qcAbnormal);
-                }
-            }
-
-            QueryWrapper<BehospitalInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("behospital_code", s.getBehospitalCode());
-            queryWrapper.eq("hospital_id", s.getHospitalId());
-            queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-            BehospitalInfo behospitalInfo = behospitalInfoServiceImpl.getOne(queryWrapper);
-            if (behospitalInfo != null) {
-                s.setGmtModified(new Date());
-                behospitalInfoServiceImpl.update(s,queryWrapper);
-            } else {
-                s.setGmtCreate(new Date());
-                behospitalInfoServiceImpl.save(s);
-            }
-        });
-    }
-}

src/main/java/com/diagbot/facade/databack/ADoctorAdviceFacade.java

@@ -1,94 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.ADoctorAdviceDTO;
-import com.diagbot.entity.DoctorAdvice;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.DoctorAdviceServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.ADoctorAdviceVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class ADoctorAdviceFacade {
-    @Autowired
-    @Qualifier("doctorAdviceServiceImpl")
-    private DoctorAdviceServiceImpl doctorAdviceServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-同步前一天的入院病人医嘱信息
-     */
-    public void executeDoctorAdvice() {
-        //String sql="select * from br_doctadvice where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from br_doctadvice where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        List<DoctorAdvice> doctorAdviceList = tzDBConn.getDoctorAdvice(sql);
-        execute(doctorAdviceList);
-    }
-
-    public void executeDoctorAdvicePast() {
-        String sql="select * from br_doctadvice where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<DoctorAdvice> doctorAdviceList = tzDBConn.getDoctorAdvice(sql);
-        execute(doctorAdviceList);
-    }
-
-    public void executeDoctorAdvicePort(){
-
-    }
-
-    /**
-     * 数据引擎-通过接口更新医生医嘱信息
-     * @param list
-     * @return
-     */
-    public RespDTO<List<ADoctorAdviceDTO>> executeDoctorAdvice(List<ADoctorAdviceVO> list) {
-        if(list!=null && list.size()>0){
-            List<DoctorAdvice> doctorAdviceList=Lists.newArrayList();
-            List<ADoctorAdviceDTO> doctorAdviceDtoList=Lists.newArrayList();
-            doctorAdviceList=BeanUtil.listCopyTo(list,DoctorAdvice.class);
-            doctorAdviceDtoList=BeanUtil.listCopyTo(list,ADoctorAdviceDTO.class);
-            //循环验证数据有效性
-            for (DoctorAdvice doctorAdvice:doctorAdviceList) {
-                if("".equals(doctorAdvice.getDoctorAdviceId())) {
-                    return RespDTO.onError("请输入病人医嘱编码!");
-                }else if(doctorAdvice.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(doctorAdvice.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            execute(doctorAdviceList);
-            return RespDTO.onSuc(doctorAdviceDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<DoctorAdvice> doctorAdviceList){
-        if (doctorAdviceList != null && doctorAdviceList.size() > 0) {
-            doctorAdviceList.stream().forEach(s -> {
-                QueryWrapper<DoctorAdvice> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("doctor_advice_id", s.getDoctorAdviceId());
-                queryWrapper.eq("hospital_id", s.getHospitalId());
-                queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-                DoctorAdvice doctorAdvice = doctorAdviceServiceImpl.getOne(queryWrapper);
-                if (doctorAdvice != null) {
-                    s.setGmtModified(new Date());
-                    doctorAdviceServiceImpl.update(s,queryWrapper);
-                } else {
-                    s.setGmtCreate(new Date());
-                    doctorAdviceServiceImpl.save(s);
-                }
-            });
-        }
-    }
-}

src/main/java/com/diagbot/facade/databack/AHomeDiagnoseInfoFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.AHomeDiagnoseDTO;
-import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.AHomeDiagnoseVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class AHomeDiagnoseInfoFacade {
-    @Autowired
-    @Qualifier("homeDiagnoseInfoServiceImpl")
-    private HomeDiagnoseInfoServiceImpl homeDiagnoseInfoServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-定时同步病案首页诊断
-     */
-    public void executeHomeDiagnose() {
-        //String sql="select * from br_recdiagnose where BASYID in (select BASYID from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate())";//今年的数据
-        //前一天的数据
-        String sql="select * from br_recdiagnose where BASYID in (select BASYID from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)))";
-        List<HomeDiagnoseInfo> homeDiagnoseList = tzDBConn.getHomeDiagnose(sql);
-        execute(homeDiagnoseList);
-    }
-
-    public void executeHomeDiagnosePast() {
-        String sql="select * from br_recdiagnose where BASYID in (select BASYID from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate())";//今年的数据
-        List<HomeDiagnoseInfo> homeDiagnoseList = tzDBConn.getHomeDiagnose(sql);
-        execute(homeDiagnoseList);
-    }
-
-    public void executeHomeDiagnosePort(){
-
-    }
-
-    /**
-     * 数据引擎-通过接口更新病案首页诊断
-     * @param list
-     * @return
-     */
-    public RespDTO<List<AHomeDiagnoseDTO>> executeHomeDiagnose(List<AHomeDiagnoseVO> list) {
-        if(list!=null && list.size()>0){
-            List<HomeDiagnoseInfo> homeDiagnoseList=Lists.newArrayList();
-            List<AHomeDiagnoseDTO> homeDiagnoseDtoList=Lists.newArrayList();
-
-            homeDiagnoseList=BeanUtil.listCopyTo(list,HomeDiagnoseInfo.class);
-            homeDiagnoseDtoList=BeanUtil.listCopyTo(list,AHomeDiagnoseDTO.class);
-            execute(homeDiagnoseList);
-            return RespDTO.onSuc(homeDiagnoseDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<HomeDiagnoseInfo> homeDiagnoseList){
-        if (homeDiagnoseList != null && homeDiagnoseList.size() > 0) {
-            homeDiagnoseList.stream().forEach(s -> {
-                if(s.getHomePageId()!=null && !"".equals(s.getDiagnoseOrderNo())){
-                    QueryWrapper<HomeDiagnoseInfo> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("home_page_id", s.getHomePageId());
-                    queryWrapper.eq("hospital_id", s.getHospitalId());
-                    queryWrapper.eq("diagnose_order_no", s.getDiagnoseOrderNo());
-                    HomeDiagnoseInfo diagnoseInfo = homeDiagnoseInfoServiceImpl.getOne(queryWrapper);
-                    if (diagnoseInfo != null) {
-                        s.setGmtModified(new Date());
-                        homeDiagnoseInfoServiceImpl.update(s,queryWrapper);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        homeDiagnoseInfoServiceImpl.save(s);
-                    }
-                }
-            });
-        }
-    }
-}

src/main/java/com/diagbot/facade/databack/AHomeOperationInfoFacade.java

@@ -1,83 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.data.AHomeOperationDTO;
-import com.diagbot.entity.HomeOperationInfo;
-import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.AHomeOperationVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class AHomeOperationInfoFacade {
-    @Autowired
-    @Qualifier("homeOperationInfoServiceImpl")
-    private HomeOperationInfoServiceImpl homeOperationInfoServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-同步前一天数据
-     */
-    public void executeHomeOperation() {
-        //String sql="select * from br_recoperation where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        //前一天数据
-        String sql="select * from br_recoperation where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
-        List<HomeOperationInfo> homeOperationList = tzDBConn.getHomeOperation(sql);
-        execute(homeOperationList);
-    }
-
-    public void executeHomeOperationPast() {
-        String sql="select * from br_recoperation where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<HomeOperationInfo> homeOperationList = tzDBConn.getHomeOperation(sql);
-        execute(homeOperationList);
-    }
-
-    public void executeHomeOperationPort(){
-
-    }
-
-    /**
-     * 数据引擎-通过接口更新病案首页手术
-     * @param list
-     * @return
-     */
-    public List<AHomeOperationDTO> executeHomeOperation(List<AHomeOperationVO> list) {
-        List<HomeOperationInfo> homeOperationList=Lists.newArrayList();
-        List<AHomeOperationDTO> homeOperationDtoList=Lists.newArrayList();
-        if(list!=null && list.size()>0){
-            homeOperationList=BeanUtil.listCopyTo(list,HomeOperationInfo.class);
-            homeOperationDtoList=BeanUtil.listCopyTo(list,AHomeOperationDTO.class);
-            execute(homeOperationList);
-        }
-        return homeOperationDtoList;
-    }
-
-    public void execute(List<HomeOperationInfo> homeOperationList){
-        if (homeOperationList != null && homeOperationList.size() > 0) {
-            homeOperationList.stream().forEach(s -> {
-                if(s.getHomePageId()!=null && !"".equals(s.getOperationOrderNo())) {
-                    QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("home_page_id", s.getHomePageId());
-                    queryWrapper.eq("hospital_id", s.getHospitalId());
-                    queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
-                    HomeOperationInfo operationInfo = homeOperationInfoServiceImpl.getOne(queryWrapper);
-                    if (operationInfo != null) {
-                        s.setGmtModified(new Date());
-                        homeOperationInfoServiceImpl.update(s,queryWrapper);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        homeOperationInfoServiceImpl.save(s);
-                    }
-                }
-            });
-        }
-    }
-}

src/main/java/com/diagbot/facade/databack/AHomePageFacade.java

@@ -1,215 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.AHomePageDTO;
-import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.entity.HomeOperationInfo;
-import com.diagbot.entity.HomePage;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
-import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
-import com.diagbot.service.impl.HomePageServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.AHomeDiagnoseVO;
-import com.diagbot.vo.data.AHomeOperationVO;
-import com.diagbot.vo.data.AHomePageVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class AHomePageFacade {
-    @Autowired
-    @Qualifier("homePageServiceImpl")
-    private HomePageServiceImpl homePageServiceImpl;
-
-    @Autowired
-    @Qualifier("homeDiagnoseInfoServiceImpl")
-    private HomeDiagnoseInfoServiceImpl homeDiagnoseInfoServiceImpl;
-
-    @Autowired
-    @Qualifier("homeOperationInfoServiceImpl")
-    private HomeOperationInfoServiceImpl homeOperationInfoServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 同步前一天病案首页
-     */
-    public void executeHomePage() {
-        //String sql="select * from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        //同步前一天的数据
-        String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        List<HomePage> homePageList = tzDBConn.getHomePage(sql);
-        execute(homePageList);
-    }
-
-    public void executeHomePagePast() {
-        String sql="select * from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<HomePage> homePageList = tzDBConn.getHomePage(sql);
-        execute(homePageList);
-    }
-
-    public void executeHomePagePort(){
-
-    }
-
-    /**
-     * 数据引擎-通过接口更新病案首页
-     * @param list
-     * @return
-     */
-    public RespDTO<List<AHomePageDTO>> executeHomePage(List<AHomePageVO> list) {
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (AHomePageVO aHomePageVO:list) {
-                if("".equals(aHomePageVO.getHomePageId())) {
-                    return RespDTO.onError("请输入病案首页编号!");
-                }else if(aHomePageVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(aHomePageVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-                //出院诊断
-                if(aHomePageVO.getLeaveDiags()!=null && aHomePageVO.getLeaveDiags().size()>0){
-                    for (AHomeDiagnoseVO aHomeDiagnoseVO:aHomePageVO.getLeaveDiags()){
-                        if("".equals(aHomeDiagnoseVO.getHomePageId())) {
-                            return RespDTO.onError("出院诊断未输入病案首页编号!");
-                        }else if(aHomeDiagnoseVO.getHospitalId()==null){
-                            return RespDTO.onError("出院诊断未输入医院编码!");
-                        }else if("".equals(aHomeDiagnoseVO.getDiagnoseOrderNo())){
-                            return RespDTO.onError("出院诊断未输入顺序号!");
-                        }
-                    }
-                };
-
-                //住院手术
-                if(aHomePageVO.getOperations()!=null && aHomePageVO.getOperations().size()>0){
-                    for (AHomeOperationVO aHomeOperationVO:aHomePageVO.getOperations()){
-                        if("".equals(aHomeOperationVO.getHomePageId())) {
-                            return RespDTO.onError("住院手术未输入病案首页编号!");
-                        }else if(aHomeOperationVO.getHospitalId()==null){
-                            return RespDTO.onError("住院手术未输入医院编码!");
-                        }else if("".equals(aHomeOperationVO.getOperationOrderNo())){
-                            return RespDTO.onError("住院手术未输入顺序号!");
-                        }
-                    }
-                }
-            }
-            //装载数据
-            List<HomePage> homePageList=Lists.newArrayList();
-            List<AHomePageDTO> homePageDtoList=Lists.newArrayList();
-            list.stream().forEach(s->{
-                //初始化入参
-                HomePage homePage=new HomePage();
-                BeanUtil.copyProperties(s,homePage);
-                homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
-                homePage.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
-                homePage.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
-                homePage.setQcDate(DateUtil.parseDate(s.getQcDate()));
-                homePageList.add(homePage);
-
-                //初始化出参
-                AHomePageDTO aHomePageDTO=new AHomePageDTO();
-                BeanUtil.copyProperties(s,aHomePageDTO);
-                homePageDtoList.add(aHomePageDTO);
-
-                //初始化诊断和手术，并同步到数据库
-                List<HomeDiagnoseInfo> homeDiagnoseList=BeanUtil.listCopyTo(s.getLeaveDiags(),HomeDiagnoseInfo.class);
-                List<HomeOperationInfo> homeOperationList=BeanUtil.listCopyTo(s.getOperations(),HomeOperationInfo.class);
-
-                executeDiagnose(homeDiagnoseList);
-                executeOperation(homeOperationList);
-            });
-            execute(homePageList);
-
-            return RespDTO.onSuc(homePageDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-
-    }
-
-    /**
-     * 病案首页
-     * @param homePageList
-     */
-    public void execute(List<HomePage> homePageList){
-        if (homePageList != null && homePageList.size() > 0) {
-            homePageList.stream().forEach(s -> {
-                QueryWrapper<HomePage> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("home_page_id", s.getHomePageId());
-                queryWrapper.eq("hospital_id", s.getHospitalId());
-                queryWrapper.eq("behospital_code", s.getBehospitalCode());
-                queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-                HomePage homePage = homePageServiceImpl.getOne(queryWrapper);
-                if (homePage != null) {
-                    s.setGmtModified(new Date());
-                    homePageServiceImpl.update(s,queryWrapper);
-                } else {
-                    s.setGmtCreate(new Date());
-                    homePageServiceImpl.save(s);
-                }
-            });
-        }
-    }
-
-    /**
-     * 出院诊断
-     * @param homeDiagnoseList
-     */
-    public void executeDiagnose(List<HomeDiagnoseInfo> homeDiagnoseList){
-        if (homeDiagnoseList != null && homeDiagnoseList.size() > 0) {
-            homeDiagnoseList.stream().forEach(s -> {
-                if(s.getHomePageId()!=null && !"".equals(s.getDiagnoseOrderNo())){
-                    QueryWrapper<HomeDiagnoseInfo> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("home_page_id", s.getHomePageId());
-                    queryWrapper.eq("diagnose_order_no", s.getDiagnoseOrderNo());
-                    queryWrapper.eq("hospital_id", s.getHospitalId());
-                    queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-                    HomeDiagnoseInfo diagnoseInfo = homeDiagnoseInfoServiceImpl.getOne(queryWrapper);
-                    if (diagnoseInfo != null) {
-                        s.setGmtModified(new Date());
-                        homeDiagnoseInfoServiceImpl.update(s,queryWrapper);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        homeDiagnoseInfoServiceImpl.save(s);
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * 手术情况
-     * @param homeOperationList
-     */
-    public void executeOperation(List<HomeOperationInfo> homeOperationList){
-        if (homeOperationList != null && homeOperationList.size() > 0) {
-            homeOperationList.stream().forEach(s -> {
-                if(s.getHomePageId()!=null && !"".equals(s.getOperationOrderNo())) {
-                    QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("home_page_id", s.getHomePageId());
-                    queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
-                    queryWrapper.eq("hospital_id", s.getHospitalId());
-                    queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-                    HomeOperationInfo operationInfo = homeOperationInfoServiceImpl.getOne(queryWrapper);
-                    if (operationInfo != null) {
-                        s.setGmtModified(new Date());
-                        homeOperationInfoServiceImpl.update(s,queryWrapper);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        homeOperationInfoServiceImpl.save(s);
-                    }
-                }
-            });
-        }
-    }
-}

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

@@ -1,75 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.AMedCrisisDTO;
-import com.diagbot.entity.MedCrisisInfo;
-import com.diagbot.service.impl.MedCrisisInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.vo.data.AMedCrisisVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class AMedCrisisFacade {
-
-    @Autowired
-    @Qualifier("medCrisisInfoServiceImpl")
-    private MedCrisisInfoServiceImpl medCrisisInfoServiceImpl;
-
-    public void executeMedCrisis(){
-
-    }
-
-    public RespDTO<List<AMedCrisisDTO>> executeMedCrisis(List<AMedCrisisVO> list) {
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (AMedCrisisVO aMedCrisisVO:list) {
-                if("".equals(aMedCrisisVO.getRecId())){
-                    return RespDTO.onError("请输入文书编码!");
-                }else if("".equals(aMedCrisisVO.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
-                }else if(aMedCrisisVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(aMedCrisisVO.getRecType())){
-                    return RespDTO.onError("请输入危急值类型!");
-                }
-            }
-
-            List<MedCrisisInfo> medCrisisList=Lists.newArrayList();
-            List<AMedCrisisDTO> medCrisisDtoList=Lists.newArrayList();
-
-            medCrisisList=BeanUtil.listCopyTo(list,MedCrisisInfo.class);
-            medCrisisDtoList=BeanUtil.listCopyTo(list,AMedCrisisDTO.class);
-            execute(medCrisisList);
-            return RespDTO.onSuc(medCrisisDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<MedCrisisInfo> medCrisisList){
-        if (medCrisisList != null && medCrisisList.size() > 0) {
-            medCrisisList.stream().forEach(s -> {
-                QueryWrapper<MedCrisisInfo> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("rec_id", s.getRecId());
-                queryWrapper.eq("hospital_id", s.getHospitalId());
-                queryWrapper.eq("behospital_code", s.getBehospitalCode());
-                queryWrapper.eq("rec_type", s.getRecType());
-                MedCrisisInfo medCrisisInfo = medCrisisInfoServiceImpl.getOne(queryWrapper);
-                if (medCrisisInfo != null) {
-                    s.setGmtModified(new Date());
-                    medCrisisInfoServiceImpl.update(s,queryWrapper);
-                } else {
-                    s.setGmtCreate(new Date());
-                    medCrisisInfoServiceImpl.save(s);
-                }
-            });
-        }
-    }
-}

src/main/java/com/diagbot/facade/databack/AMedRecordTypeFacade.java

@@ -1,94 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.AMedicalRecordTypeDTO;
-import com.diagbot.entity.MedRecordType;
-import com.diagbot.service.impl.MedRecordTypeServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.AMedicalRecordTypeVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class AMedRecordTypeFacade {
-    @Autowired
-    @Qualifier("medRecordTypeServiceImpl")
-    private MedRecordTypeServiceImpl medRecordTypeServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-同步前一天变更的模板类型
-     */
-    public void executeMRType() {
-        String sql="select * from ar_medirecclass where SFZFPB='1' and cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<MedRecordType> medRecordTypeList = tzDBConn.getMedicalRecordType(sql);
-        execute(medRecordTypeList);
-    }
-
-    /**
-     * 同步前一天变更的模板类型
-     */
-    public void executeMRTypePast() {
-        String sql="select * from ar_medirecclass where SFZFPB='1' and cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<MedRecordType> medRecordTypeList = tzDBConn.getMedicalRecordType(sql);
-        execute(medRecordTypeList);
-    }
-
-    /**
-     * 数据引擎-通过接口更新病人住院记录信息
-     * @param list
-     * @return
-     */
-    public RespDTO<List<AMedicalRecordTypeDTO>> executeMRType(List<AMedicalRecordTypeVO> list) {
-        if(list!=null && list.size()>0){
-            List<MedRecordType> medRecordTypeList=Lists.newArrayList();
-            List<AMedicalRecordTypeDTO> medRecordTypeDtoList=Lists.newArrayList();
-            medRecordTypeList=BeanUtil.listCopyTo(list,MedRecordType.class);
-            medRecordTypeDtoList=BeanUtil.listCopyTo(list,AMedicalRecordTypeDTO.class);
-            //循环验证数据有效性
-            for (MedRecordType medRecordType:medRecordTypeList) {
-                if("".equals(medRecordType.getTypeId())) {
-                    return RespDTO.onError("请输入文书类型编码!");
-                }else if(medRecordType.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(medRecordType.getTypeName())){
-                    return RespDTO.onError("请文书类型名称!");
-                }
-            }
-            execute(medRecordTypeList);
-            return RespDTO.onSuc(medRecordTypeDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void executeMRTypePort(){
-
-    }
-
-    public void execute(List<MedRecordType> medRecordTypeList){
-        List<MedRecordType> add = Lists.newLinkedList();
-        List<MedRecordType> updateE = Lists.newLinkedList();
-        if (medRecordTypeList != null && medRecordTypeList.size() != 0) {
-            medRecordTypeList.stream().forEach(s -> {
-                QueryWrapper<MedRecordType> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("type_id", s.getTypeId());
-                queryWrapper.eq("hospital_id", s.getHospitalId());
-                //queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-                MedRecordType mrType = medRecordTypeServiceImpl.getOne(queryWrapper);
-                if (mrType != null) {
-                    medRecordTypeServiceImpl.update(s,queryWrapper);
-                } else {
-                    medRecordTypeServiceImpl.save(s);
-                }
-            });
-        }
-    }
-}

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

@@ -1,81 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.data.AMedicalRecordContentDTO;
-import com.diagbot.entity.MedicalRecordContent;
-import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.AMedicalRecordContentVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-@Component
-public class AMedicalRecordContentFacade {
-    @Autowired
-    @Qualifier("medicalRecordContentServiceImpl")
-    private MedicalRecordContentServiceImpl medicalRecordContentServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-同步前一天的病历详细记录
-     */
-    public void executeMrRecordContent() {
-        //String sql="select * from mr_mrcontent  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select BLJLID,BLJLNR from mr_mrcontent  where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        List<MedicalRecordContent> mrContentList = tzDBConn.getMedicalRecordContent(sql);
-        execute(mrContentList);
-    }
-
-    /**
-     * 同步前一天的病历详细记录
-     */
-    public void executeMrRecordContentPast() {
-        String sql="select * from mr_mrcontent  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<MedicalRecordContent> mrContentList = tzDBConn.getMedicalRecordContent(sql);
-        execute(mrContentList);
-    }
-
-    public void executeMrRecordContentPort(){
-
-    }
-
-    /**
-     * 数据引擎-通过接口更新病历内容
-     * @param list
-     * @return
-     */
-    public List<AMedicalRecordContentDTO> executeMrRecordContent(List<AMedicalRecordContentVO> list) {
-        List<MedicalRecordContent> mrContentList=Lists.newArrayList();
-        List<AMedicalRecordContentDTO> mrContentDtoList=Lists.newArrayList();
-        if(list!=null && list.size()>0){
-            mrContentList=BeanUtil.listCopyTo(list,MedicalRecordContent.class);
-            mrContentDtoList=BeanUtil.listCopyTo(list,AMedicalRecordContentDTO.class);
-            execute(mrContentList);
-        }
-        return mrContentDtoList;
-    }
-
-    public void execute(List<MedicalRecordContent> mrContentList){
-        if (mrContentList != null && mrContentList.size() > 0) {
-            mrContentList.stream().forEach(s -> {
-                QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("rec_id", s.getRecId());
-                queryWrapper.eq("hospital_id", s.getHospitalId());
-                MedicalRecordContent mrContent = medicalRecordContentServiceImpl.getOne(queryWrapper);
-                if (mrContent != null) {
-                    s.setGmtModified(new Date());
-                    medicalRecordContentServiceImpl.updateById(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    medicalRecordContentServiceImpl.save(s);
-                }
-            });
-        }
-    }
-}

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

@@ -1,281 +0,0 @@
-package com.diagbot.facade.databack;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.AMedicalRecordDTO;
-import com.diagbot.dto.data.AMrContentDTO;
-import com.diagbot.entity.*;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.QcAbnormalFacade;
-import com.diagbot.service.impl.BehospitalInfoServiceImpl;
-import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
-import com.diagbot.service.impl.MedicalRecordServiceImpl;
-import com.diagbot.service.impl.QcModelHospitalServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ReadProperties;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.AnalyzeApiVO;
-import com.diagbot.vo.data.AMedicalRecordVO;
-import com.diagbot.vo.data.AMrContentVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class AMedicalRecordFacade {
-
-    @Autowired
-    @Qualifier("medicalRecordServiceImpl")
-    private MedicalRecordServiceImpl medicalRecordServiceImpl;
-
-    @Autowired
-    @Qualifier("qcModelHospitalServiceImpl")
-    private QcModelHospitalServiceImpl qcModelHospitalServiceImpl;
-
-    @Autowired
-    @Qualifier("medicalRecordContentServiceImpl")
-    private MedicalRecordContentServiceImpl medicalRecordContentServiceImpl;
-
-    @Autowired
-    @Qualifier("behospitalInfoServiceImpl")
-    private BehospitalInfoServiceImpl behospitalInfoServiceImpl;
-
-    @Autowired
-    private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
-    @Autowired
-    private BehospitalInfoFacade behospitalInfoFacade;
-
-    @Autowired
-    private QcAbnormalFacade qcAbnormalFacade;
-
-    @Autowired
-    private ReadProperties readProperties;
-
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-同步前一天的病历记录
-     */
-    public void executeMrRecord() {
-        //String sql="select * from mr_medicalrecords  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from mr_medicalrecords  where cjcxrq>=(select CONVERT(varchar,GETDATE()-1,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        List<MedicalRecord> medicalRecordList = tzDBConn.getMedicalRecord(sql);
-        execute(medicalRecordList);
-    }
-
-    public void executeMrRecordPast() {
-        String sql="select * from mr_medicalrecords  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<MedicalRecord> medicalRecordList = tzDBConn.getMedicalRecord(sql);
-        execute(medicalRecordList);
-    }
-
-    public void executeMrRecordPort(){
-
-    }
-
-    /**
-     * 通过接口更新病历记录
-     * @param list
-     * @return
-     */
-    public RespDTO<List<AMedicalRecordDTO>> executeMrRecordView(List<AMedicalRecordVO> list) {
-        if(list!=null && list.size()>0) {
-            //循环验证数据有效性
-            for (AMedicalRecordVO aMedicalRecordVO : list) {
-                if ("".equals(aMedicalRecordVO.getRecId())) {
-                    return RespDTO.onError("请输入文书序号!");
-                } else if (aMedicalRecordVO.getHospitalId() == null) {
-                    return RespDTO.onError("请输入医院编码!");
-                } else if ("".equals(aMedicalRecordVO.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
-                } else if ("".equals(aMedicalRecordVO.getRecTypeId())) {
-                    return RespDTO.onError("请输入病历类别编号!");
-                } else if ("".equals(aMedicalRecordVO.getRecTitle())) {
-                    return RespDTO.onError("请输入病历标题!");
-                } else if (aMedicalRecordVO.getContents() == null || aMedicalRecordVO.getContents().size() == 0) {
-                    return RespDTO.onError("请输入文书详情!");
-                }
-            }
-            //装载数据
-            initData(list);
-            List<AMedicalRecordDTO> medicalRecordDTOList = Lists.newArrayList();
-            medicalRecordDTOList = BeanUtil.listCopyTo(list, AMedicalRecordDTO.class);
-            return RespDTO.onSuc(medicalRecordDTOList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    /**
-     * 数据引擎-通过接口更新病历记录
-     * @param aMrContentVO
-     * @return
-     */
-    public RespDTO<Map<String, Object>> executeMrRecord(AMrContentVO aMrContentVO) {
-        if(aMrContentVO.getRecords()!=null && aMrContentVO.getRecords().size()>0){
-            AMrContentDTO aMrContentDTO=new AMrContentDTO();
-            //循环验证数据有效性
-            for (AMedicalRecordVO aMedicalRecordVO : aMrContentVO.getRecords()) {
-                if ("".equals(aMedicalRecordVO.getRecId())) {
-                    return RespDTO.onError("请输入文书序号!");
-                } else if (aMedicalRecordVO.getHospitalId() == null) {
-                    return RespDTO.onError("请输入医院编码!");
-                } else if ("".equals(aMedicalRecordVO.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
-                } else if ("".equals(aMedicalRecordVO.getRecTypeId())) {
-                    return RespDTO.onError("请输入病历类别编号!");
-                } else if ("".equals(aMedicalRecordVO.getRecTitle())) {
-                    return RespDTO.onError("请输入病历标题!");
-                } else if (aMedicalRecordVO.getContents() == null || aMedicalRecordVO.getContents().size() == 0) {
-                    return RespDTO.onError("请输入文书详情!");
-                }
-            }
-            //装载数据
-            initData(aMrContentVO.getRecords());
-
-            String behospitalCode =aMrContentVO.getRecords().get(0).getBehospitalCode();
-            Long hospitalId=aMrContentVO.getRecords().get(0).getHospitalId();
-            MedicalRecord medicalRecord=new MedicalRecord();
-            BeanUtil.copyProperties(aMrContentVO.getRecords().get(0),medicalRecord);
-            Long modeId=initModeId(medicalRecord);
-
-            if(aMrContentVO.getDockModeType().equals("1")){
-                if(modeId==0 || modeId==null){
-                    return RespDTO.onError("无对应的文书类型");
-                }
-                //页面模式
-                String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
-                Map<String,Object> map=new HashMap<String,Object>();
-                map.put("url",url);
-                return RespDTO.onSuc(map);
-            }else if(aMrContentVO.getDockModeType().equals("2")){
-                AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
-                analyzeApiVO.setBehospitalCode(behospitalCode);
-                analyzeApiVO.setHospitalId(hospitalId);
-                Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
-                //接口引擎模式
-                return RespDTO.onSuc(map);
-            }else{
-                if(modeId==0 || modeId==null){
-                    return RespDTO.onError("无对应的文书类型");
-                }
-                //页面模式
-                String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
-
-                AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
-                analyzeApiVO.setBehospitalCode(behospitalCode);
-                analyzeApiVO.setHospitalId(hospitalId);
-                Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
-
-                map.put("url",url);
-
-                return RespDTO.onSuc(map);
-            }
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    private void initData(List<AMedicalRecordVO> list){
-        List<MedicalRecord> medicalRecordList = Lists.newArrayList();
-        medicalRecordList = BeanUtil.listCopyTo(list, MedicalRecord.class);
-
-        execute(medicalRecordList);
-        list.stream().forEach(s -> {
-            List<MedicalRecordContent> contents = Lists.newArrayList();
-            contents = BeanUtil.listCopyTo(s.getContents(), MedicalRecordContent.class);
-
-            executeContent(contents);
-        });
-    }
-
-    public void execute(List<MedicalRecord> medicalRecordList){
-        if (medicalRecordList != null && medicalRecordList.size() > 0) {
-            medicalRecordList.stream().forEach(s -> {
-                //初始化mode_id
-                Long modeId=initModeId(s);
-                if(modeId==Long.valueOf("0")){
-                    //新增类型到监测表中
-                    QcAbnormal qcAbnormal=new QcAbnormal();
-                    qcAbnormal.setHospitalId(s.getHospitalId());
-                    qcAbnormal.setBehospitalCode(s.getBehospitalCode());
-                    qcAbnormal.setType(1);
-                    qcAbnormal.setDescription(s.getRecTitle());
-                    qcAbnormal.setGmtCreate(new Date());
-                    qcAbnormalFacade.save(qcAbnormal);
-                }
-                s.setModeId(modeId);
-                //新增或修改
-                saveOrUpdate(s);
-            });
-        }
-    }
-
-    public void executeContent(List<MedicalRecordContent> mrContentList){
-        if (mrContentList != null && mrContentList.size() > 0) {
-            mrContentList.stream().forEach(s -> {
-                QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("rec_id", s.getRecId());
-                queryWrapper.eq("hospital_id", s.getHospitalId());
-                queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-                MedicalRecordContent mrContent = medicalRecordContentServiceImpl.getOne(queryWrapper);
-                if (mrContent != null) {
-                    s.setGmtModified(new Date());
-                    medicalRecordContentServiceImpl.update(s,queryWrapper);
-                } else {
-                    s.setGmtCreate(new Date());
-                    medicalRecordContentServiceImpl.save(s);
-                }
-            });
-        }
-    }
-
-    /**
-     * 新增或修改文书信息
-     * @param medicalRecord
-     */
-    private void saveOrUpdate(MedicalRecord medicalRecord){
-        QueryWrapper<MedicalRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("rec_id", medicalRecord.getRecId());
-        queryWrapper.eq("hospital_id", medicalRecord.getHospitalId());
-        queryWrapper.eq("behospital_code", medicalRecord.getBehospitalCode());
-        queryWrapper.eq("is_deleted",IsDeleteEnum.N);
-        MedicalRecord mRecord = medicalRecordServiceImpl.getOne(queryWrapper);
-        if (mRecord != null) {
-            medicalRecord.setGmtModified(new Date());
-            medicalRecordServiceImpl.update(medicalRecord,queryWrapper);
-        } else {
-            medicalRecord.setGmtCreate(new Date());
-            medicalRecordServiceImpl.save(medicalRecord);
-        }
-    }
-
-    /**
-     * 初始化模型ID
-     * @param medicalRecord
-     * @return
-     */
-    private Long initModeId(MedicalRecord medicalRecord){
-        Long modeId=Long.valueOf("0");
-        QueryWrapper<QcModelHospital> wrapper = new QueryWrapper<>();
-        wrapper.eq("hospital_id",medicalRecord.getHospitalId());
-        wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
-        //wrapper.eq("is_deleted",IsDeleteEnum.N);
-        QcModelHospital mode=qcModelHospitalServiceImpl.getOne(wrapper);
-        if(mode!=null){
-            modeId=mode.getStandModelId();
-        }else{
-            modeId=Long.valueOf("0");
-        }
-        return modeId;
-    }
-}

src/main/java/com/diagbot/task/BasDeptInfoTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.diagbot.facade.databack.ABasDeptInfoFacade;
+import com.diagbot.facade.data.ABasDeptInfoFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/BasDoctorInfoTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.diagbot.facade.databack.ABasDoctorInfoFacade;
+import com.diagbot.facade.data.ABasDoctorInfoFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/BehospitalInfoTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.diagbot.facade.databack.ABehospitalInfoFacade;
+import com.diagbot.facade.data.ABehospitalInfoFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/DoctorAdviceTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.diagbot.facade.databack.ADoctorAdviceFacade;
+import com.diagbot.facade.data.ADoctorAdviceFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/HomeDiagnoseInfoTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.diagbot.facade.databack.AHomeDiagnoseInfoFacade;
+import com.diagbot.facade.data.AHomeDiagnoseInfoFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/HomeOperationInfoTask.java

@@ -4,7 +4,7 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.diagbot.facade.*;
-import com.diagbot.facade.databack.AHomeOperationInfoFacade;
+import com.diagbot.facade.data.AHomeOperationInfoFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/HomePageTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.diagbot.facade.databack.AHomePageFacade;
+import com.diagbot.facade.data.AHomePageFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/MedCrisisTask.java

@@ -3,8 +3,8 @@ package com.diagbot.task;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.SysTaskCron;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.databack.AMedCrisisFacade;
 import com.diagbot.facade.SysTaskCronFacade;
+import com.diagbot.facade.data.AMedCrisisFacade;
 import com.diagbot.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +44,7 @@ public class MedCrisisTask implements SchedulingConfigurer {
                         && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
                         && task001.getIsUsed().equals(1)) {
                     log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    aMedCrisisFacade.executeMedCrisis();
+                    //aMedCrisisFacade.executeMedCrisis();
                 }
             }
         }, new Trigger() {

src/main/java/com/diagbot/task/MedicalRecordContentTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.diagbot.facade.databack.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/MedicalRecordTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.diagbot.facade.databack.AMedicalRecordFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;

src/main/java/com/diagbot/task/MedicalRecordTypeTask.java

@@ -3,7 +3,7 @@ package com.diagbot.task;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.SysTaskCron;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.databack.AMedRecordTypeFacade;
+import com.diagbot.facade.data.AMedRecordTypeFacade;
 import com.diagbot.facade.SysTaskCronFacade;
 import com.diagbot.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;

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

@@ -270,7 +270,9 @@ public class TZDBConn {
 				homePageVO.setName(rs.getString("BRBAXM"));//姓名
 				homePageVO.setSex(rs.getString("BRBAXB"));//性别
 				homePageVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
+				if(StringUtil.isNotBlank(rs.getString("BRDQNL"))){
 				homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null:rs.getString("BRDQNL"));//病人年龄
+				}
 				homePageVO.setAgeUnit(rs.getString("BRNLDW"));//年龄单位
 				homePageVO.setNationality(rs.getString("BRBAGJ"));//国籍
 				homePageVO.setNewbornMonth(rs.getString("YENLYS"));//新生儿出生月数
@@ -556,7 +558,7 @@ public class TZDBConn {
 				behospitalInfo.setDiagnose(rs.getString("JBMSXX"));//疾病名称
 				behospitalInfo.setDoctorId(rs.getString("ZZYSID"));//医生ID
 				behospitalInfo.setDoctorName(rs.getString("ZZYSXM"));//医生姓名
-				
+				behospitalInfo.setIsPlacefile(rs.getString("requestflag"));
 				behospitalInfoList.add(behospitalInfo);
 			}
 		} catch (Exception e) {

src/main/resources/mapper/MedicalRecordMapper.xml

@@ -9,6 +9,7 @@
         <result column="behospital_code" property="behospitalCode" />
         <result column="org_code" property="orgCode" />
         <result column="rec_type_id" property="recTypeId" />
+        <result column="mode_id" property="modeId" />
         <result column="rec_date" property="recDate" />
         <result column="rec_title" property="recTitle" />
         <result column="is_deleted" property="isDeleted" />