Browse Source

1、版本升级:
2、调整同步,
3、增加运行质控

lantone 5 years ago
parent
commit
62cb9c26fa

+ 4 - 5
src/main/java/com/diagbot/dto/data/AHomePageDTO.java

@@ -1,6 +1,5 @@
 package com.diagbot.dto.data;
 
-import java.util.Date;
 import java.util.List;
 
 import com.diagbot.vo.data.AHomeDiagnoseVO;
@@ -74,7 +73,7 @@ public class AHomePageDTO {
     /**
      * 出生日期
      */
-    private Date birthday;
+    private String birthday;
 
     /**
      * 年龄
@@ -209,7 +208,7 @@ public class AHomePageDTO {
     /**
      * 入院时间
      */
-    private Date behospitalDate;
+    private String behospitalDate;
 
     /**
      * 入院科别
@@ -239,7 +238,7 @@ public class AHomePageDTO {
     /**
      * 出院时间
      */
-    private Date leaveHospitalDate;
+    private String leaveHospitalDate;
 
     /**
      * 出院科别
@@ -384,7 +383,7 @@ public class AHomePageDTO {
     /**
      * 质控日期
      */
-    private Date qcDate;
+    private String qcDate;
 
     /**
      * 离院方式

+ 17 - 5
src/main/java/com/diagbot/facade/AHomePageFacade.java

@@ -12,6 +12,7 @@ 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;
@@ -106,18 +107,29 @@ public class AHomePageFacade {
             //装载数据
             List<HomePage> homePageList=Lists.newArrayList();
             List<AHomePageDTO> homePageDtoList=Lists.newArrayList();
-            homePageList=BeanUtil.listCopyTo(list,HomePage.class);
-            homePageDtoList=BeanUtil.listCopyTo(list,AHomePageDTO.class);
-
-            execute(homePageList);
-
             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{

+ 16 - 1
src/main/java/com/diagbot/facade/AMedicalRecordFacade.java

@@ -146,6 +146,7 @@ public class AMedicalRecordFacade {
             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("无对应的文书类型");
@@ -161,9 +162,23 @@ public class AMedicalRecordFacade {
                 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);
             }
-            return RespDTO.onSuc("");
         }else{
             return RespDTO.onError("未接收到数据!");
         }

+ 1 - 1
src/main/java/com/diagbot/task/BasDeptInfoTask.java

@@ -56,7 +56,7 @@ public class BasDeptInfoTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK011"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/BasDoctorInfoTask.java

@@ -55,7 +55,7 @@ public class BasDoctorInfoTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK010"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/BehospitalInfoTask.java

@@ -55,7 +55,7 @@ public class BehospitalInfoTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK008"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/DoctorAdviceTask.java

@@ -56,7 +56,7 @@ public class DoctorAdviceTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK009"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/HomeDiagnoseInfoTask.java

@@ -57,7 +57,7 @@ public class HomeDiagnoseInfoTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK003"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/HomeOperationInfoTask.java

@@ -55,7 +55,7 @@ public class HomeOperationInfoTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK004"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/HomePageTask.java

@@ -56,7 +56,7 @@ public class HomePageTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK002"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/MedCrisisTask.java

@@ -54,7 +54,7 @@ public class MedCrisisTask implements SchedulingConfigurer {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK012"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/MedicalRecordContentTask.java

@@ -57,7 +57,7 @@ public class MedicalRecordContentTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK007"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/MedicalRecordTask.java

@@ -56,7 +56,7 @@ public class MedicalRecordTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK006"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 1 - 1
src/main/java/com/diagbot/task/MedicalRecordTypeTask.java

@@ -54,7 +54,7 @@ public class MedicalRecordTypeTask implements SchedulingConfigurer {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK005"));
-                String cron = "0 0/5 * * * ?";
+                String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
                     cron = task001.getCron();

+ 4 - 5
src/main/java/com/diagbot/vo/data/AHomePageVO.java

@@ -3,7 +3,6 @@ package com.diagbot.vo.data;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
 import java.util.List;
 
 @Getter
@@ -72,7 +71,7 @@ public class AHomePageVO {
     /**
      * 出生日期
      */
-    private Date birthday;
+    private String birthday;
 
     /**
      * 年龄
@@ -207,7 +206,7 @@ public class AHomePageVO {
     /**
      * 入院时间
      */
-    private Date behospitalDate;
+    private String behospitalDate;
 
     /**
      * 入院科别
@@ -237,7 +236,7 @@ public class AHomePageVO {
     /**
      * 出院时间
      */
-    private Date leaveHospitalDate;
+    private String leaveHospitalDate;
 
     /**
      * 出院科别
@@ -382,7 +381,7 @@ public class AHomePageVO {
     /**
      * 质控日期
      */
-    private Date qcDate;
+    private String qcDate;
 
     /**
      * 离院方式

+ 1 - 1
src/main/resources/application-local.yml

@@ -58,7 +58,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.100.157:3306/qc_test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.100.157:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息