Browse Source

getOne 改成不报错

gaodm 5 years ago
parent
commit
f9518b1fd6
24 changed files with 41 additions and 44 deletions
  1. 1 1
      src/main/java/com/diagbot/facade/ModelHospitalFacade.java
  2. 1 1
      src/main/java/com/diagbot/facade/QcAbnormalFacade.java
  3. 1 1
      src/main/java/com/diagbot/facade/data/ABasDeptInfoFacade.java
  4. 3 3
      src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java
  5. 1 1
      src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java
  6. 1 1
      src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java
  7. 1 1
      src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java
  8. 1 1
      src/main/java/com/diagbot/facade/data/AHomePageFacade.java
  9. 1 1
      src/main/java/com/diagbot/facade/data/AMedCrisisFacade.java
  10. 1 1
      src/main/java/com/diagbot/facade/data/AMedRecordTypeFacade.java
  11. 1 1
      src/main/java/com/diagbot/facade/data/AMedicalRecordContentFacade.java
  12. 4 4
      src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java
  13. 1 1
      src/main/java/com/diagbot/task/BasDeptInfoTask.java
  14. 1 1
      src/main/java/com/diagbot/task/BasDoctorInfoTask.java
  15. 1 1
      src/main/java/com/diagbot/task/BehospitalInfoAnalyzeTask.java
  16. 1 1
      src/main/java/com/diagbot/task/BehospitalInfoTask.java
  17. 1 1
      src/main/java/com/diagbot/task/DoctorAdviceTask.java
  18. 13 15
      src/main/java/com/diagbot/task/HomeDiagnoseInfoTask.java
  19. 1 1
      src/main/java/com/diagbot/task/HomeOperationInfoTask.java
  20. 1 1
      src/main/java/com/diagbot/task/HomePageTask.java
  21. 1 1
      src/main/java/com/diagbot/task/MedicalRecordContentTask.java
  22. 1 1
      src/main/java/com/diagbot/task/MedicalRecordTask.java
  23. 1 1
      src/main/java/com/diagbot/task/MedicalRecordTypeTask.java
  24. 1 2
      src/main/java/com/diagbot/task/TASK_CX.java

+ 1 - 1
src/main/java/com/diagbot/facade/ModelHospitalFacade.java

@@ -55,7 +55,7 @@ public class ModelHospitalFacade extends ModelHospitalServiceImpl {
         QueryWrapper<ModelHospital> queryModelHospital = new QueryWrapper<>();
         queryModelHospital.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id",modeId);
-        ModelHospital modelHospital = modelHospitalService.getOne(queryModelHospital);
+        ModelHospital modelHospital = modelHospitalService.getOne(queryModelHospital, false);
         if(modelHospital == null){
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在!");
         }

+ 1 - 1
src/main/java/com/diagbot/facade/QcAbnormalFacade.java

@@ -120,7 +120,7 @@ public class QcAbnormalFacade extends QcAbnormalServiceImpl {
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
                 .eq("hospital_model_name", qcAbnormalModeVO.getDescription());
-        ModelHospital modeHospital = modelHospitalFacade.getOne(queryWrapper);
+        ModelHospital modeHospital = modelHospitalFacade.getOne(queryWrapper, false);
         List<QcModeAllDTO> dataMode = qcModeFacade.getModeAll();
         data.setQcModeDatas(dataMode);
         data.setDescription(qcAbnormalModeVO.getDescription());

+ 1 - 1
src/main/java/com/diagbot/facade/data/ABasDeptInfoFacade.java

@@ -79,7 +79,7 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
         basDeptInfoList.stream().forEach(s -> {
             BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
             .eq("dept_id", s.getDeptId())
-            .eq("hospital_id", s.getHospitalId()));
+            .eq("hospital_id", s.getHospitalId()), false);
             if (basDeptInfo != null) {
                 s.setGmtModified(new Date());
                 updateE.add(s);

+ 3 - 3
src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -114,7 +114,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
             BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
                     .eq("behospital_code", s.getBehospitalCode())
                     .eq("hospital_id", s.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N));
+                    .eq("is_deleted",IsDeleteEnum.N), false);
             if (behospitalInfo != null) {
                 s.setGmtModified(new Date());
                 s.setQcTypeId(initQcTypeId(s));
@@ -145,12 +145,12 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("behospital_code", s.getBehospitalCode())
                 .eq("hospital_id", s.getHospitalId())
                 .eq("mode_id", Long.valueOf("1"))
-                .eq("is_deleted",IsDeleteEnum.N));
+                .eq("is_deleted",IsDeleteEnum.N), false);
         if(medicalRecord!=null){
             QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                     .eq("name",medicalRecord.getRecTitle())
                     .eq("hospital_id", s.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N));
+                    .eq("is_deleted",IsDeleteEnum.N), false);
             if(qcType!=null){
                 qcTypeId=qcType.getId();
             }else{

+ 1 - 1
src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java

@@ -89,7 +89,7 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 DoctorAdvice doctorAdvice = this.getOne(new QueryWrapper<DoctorAdvice>()
                         .eq("doctor_advice_id", s.getDoctorAdviceId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code",s.getBehospitalCode()));
+                        .eq("behospital_code",s.getBehospitalCode()), false);
                 if (doctorAdvice != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

+ 1 - 1
src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java

@@ -64,7 +64,7 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                     HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
                             .eq("home_page_id", s.getHomePageId())
                             .eq("hospital_id", s.getHospitalId())
-                            .eq("diagnose_order_no", s.getDiagnoseOrderNo()));
+                            .eq("diagnose_order_no", s.getDiagnoseOrderNo()), false);
                     if (diagnoseInfo != null) {
                         s.setGmtModified(new Date());
                         updateE.add(s);

+ 1 - 1
src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java

@@ -67,7 +67,7 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                     queryWrapper.eq("home_page_id", s.getHomePageId());
                     queryWrapper.eq("hospital_id", s.getHospitalId());
                     queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
-                    HomeOperationInfo operationInfo = this.getOne(queryWrapper);
+                    HomeOperationInfo operationInfo = this.getOne(queryWrapper, false);
                     if (operationInfo != null) {
                         s.setGmtModified(new Date());
                         updateE.add(s);

+ 1 - 1
src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -250,7 +250,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 HomePage homePage = this.getOne(new QueryWrapper<HomePage>()
                         .eq("home_page_id", s.getHomePageId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code", s.getBehospitalCode()));
+                        .eq("behospital_code", s.getBehospitalCode()), false);
                 if (homePage != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

+ 1 - 1
src/main/java/com/diagbot/facade/data/AMedCrisisFacade.java

@@ -64,7 +64,7 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
                 .eq("rec_id", s.getRecId())
                 .eq("hospital_id", s.getHospitalId())
                 .eq("behospital_code", s.getBehospitalCode())
-                .eq("rec_type", s.getRecType()));
+                .eq("rec_type", s.getRecType()), false);
                 if (medCrisisInfo != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

+ 1 - 1
src/main/java/com/diagbot/facade/data/AMedRecordTypeFacade.java

@@ -71,7 +71,7 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
                 MedRecordType mrType = this.getOne(new QueryWrapper<MedRecordType>()
                         .eq("type_id", s.getTypeId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("is_deleted",IsDeleteEnum.N));
+                        .eq("is_deleted",IsDeleteEnum.N), false);
                 if (mrType != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

+ 1 - 1
src/main/java/com/diagbot/facade/data/AMedicalRecordContentFacade.java

@@ -58,7 +58,7 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
                 QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("rec_id", s.getRecId());
                 queryWrapper.eq("hospital_id", s.getHospitalId());
-                MedicalRecordContent mrContent = this.getOne(queryWrapper);
+                MedicalRecordContent mrContent = this.getOne(queryWrapper, false);
                 if (mrContent != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

+ 4 - 4
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -222,14 +222,14 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
                     BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
                             .eq("behospital_code", s.getBehospitalCode())
-                            .eq("hospital_id", s.getHospitalId()));
+                            .eq("hospital_id", s.getHospitalId()), false);
                     if(behospitalInfo!=null){
                         //如果病人住院信息存在,更新对应的qc_type_id
                         Long qcTypeId=Long.valueOf("0");
                         QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                                 .eq("name",s.getRecTitle())
                                 .eq("hospital_id", s.getHospitalId())
-                                .eq("is_deleted",IsDeleteEnum.N));
+                                .eq("is_deleted",IsDeleteEnum.N), false);
                         if(qcType!=null){
                             behospitalInfo.setQcTypeId(qcType.getId());
                         }else{
@@ -259,7 +259,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 MedicalRecord mRecord = this.getOne(new QueryWrapper<MedicalRecord>()
                         .eq("rec_id", s.getRecId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code", s.getBehospitalCode()));
+                        .eq("behospital_code", s.getBehospitalCode()), false);
                 if (mRecord != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);
@@ -294,7 +294,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
         wrapper.eq("hospital_id",medicalRecord.getHospitalId());
         wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
-        ModelHospital mode=modelHospitalFacade.getOne(wrapper);
+        ModelHospital mode=modelHospitalFacade.getOne(wrapper, false);
         if(mode!=null){
             modeId=mode.getStandModelId();
         }else{

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

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

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

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

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

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

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

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

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

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

+ 13 - 15
src/main/java/com/diagbot/task/HomeDiagnoseInfoTask.java

@@ -1,9 +1,12 @@
 package com.diagbot.task;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.SysTaskCron;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.SysTaskCronFacade;
 import com.diagbot.facade.data.AHomeDiagnoseInfoFacade;
+import com.diagbot.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;
@@ -13,26 +16,21 @@ import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.support.CronTrigger;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
+import java.time.LocalDateTime;
+import java.util.Date;
 
 @Configuration      //1.主要用于标记配置类,兼备Component的效果。
 @EnableScheduling   // 2.开启定时任务
 @Slf4j
-public class HomeDiagnoseInfoTask implements SchedulingConfigurer{
-	@Autowired
+public class HomeDiagnoseInfoTask implements SchedulingConfigurer {
+    @Autowired
     private SysTaskCronFacade sysTaskCronFacade;
 
     private SysTaskCron task001 = new SysTaskCron();
 
     @Autowired
-   	private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
-    
+    private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
+
     /**
      * 执行定时任务.
      */
@@ -54,7 +52,7 @@ public class HomeDiagnoseInfoTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK003"));
+                        .eq("cron_code", "TASK003"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

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

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

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

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

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

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

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

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

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

+ 1 - 2
src/main/java/com/diagbot/task/TASK_CX.java

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