诊断疾病不能为空

account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java

@@ -603,7 +603,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
             chDisabDetailAccounts.setAccountsOverallCost(zero);
             chDisabDetailAccounts.setModeName(accountsVO.getSrvModeName());
             chDisabDetailAccounts.setCreationTime(new Date());
-            chDisabDetailAccounts.setAccountsTime(new Date());
+            chDisabDetailAccounts.setAccountsTime(DateUtils.strToDate(accountsVO.getSrvDate()));
             chDisabDetailAccounts.setAccountsStartTime(DateUtils.strToTime(accountsVO.getSrvStartTime()));
             chDisabDetailAccounts.setAccountsEndTime(DateUtils.strToTime(accountsVO.getSrvEndTime()));
             chDisabDetailAccounts.setTaskDetailId(accountsVO.getTaskDetailId());

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -310,9 +310,12 @@ public class DisableController {
         if (chDisableApply.getSrvModeId() == null) {
             return Result.failed("申请服务方式不能为空!");
         }
-        if (StringUtils.isBlank(chDisableApply.getDiseaseDesc())) {
-            return Result.failed("疾病描述及诊断不能为空!");
+        if (chDisableApply.getDiseTypeF() == null) {
+            return Result.failed("诊断疾病不能为空!");
         }
+      /*  if (StringUtils.isBlank(chDisableApply.getDiseaseDesc())) {
+            return Result.failed("疾病描述及诊断不能为空!");
+        }*/
         if (chDisableApply.getMedicalType() == null) {
             return Result.failed("医保类型不能为空!");
         }
@@ -365,9 +368,13 @@ public class DisableController {
         if (chDisableApply.getSrvModeId() == null) {
             return Result.failed("申请服务方式不能为空!");
         }
-        if (StringUtils.isBlank(chDisableApply.getDiseaseDesc())) {
-            return Result.failed("疾病描述及诊断不能为空!");
+        if (chDisableApply.getDiseTypeF() == null) {
+            return Result.failed("诊断疾病不能为空!");
         }
+
+   /*     if (StringUtils.isBlank(chDisableApply.getDiseaseDesc())) {
+            return Result.failed("疾病描述及诊断不能为空!");
+        }*/
         if (chDisableApply.getMedicalType() == null) {
             return Result.failed("医保类型不能为空!");
         }