Merge branch 'dev_nursing_records_20230214' into dev_ch_master

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

@@ -279,7 +279,10 @@ public class SrvTaskServiceImpl implements SrvTaskService {
         Long modeId = srvPlanInputVO.getModeId();
         if (CollectionUtil.isNotEmpty(chSrvTaskDetailList)) {
             if(modeId == 3){
-                return Result.failed("手机app已有计划,不可重复生成");
+                int status = chSrvTaskDetailList.stream().map(ChSrvTaskDetail::getStatus).findFirst().orElse((short)0);
+                if(status == 1 || status == 4) {
+                    return Result.failed("手机app已有任务,不可重复生成");
+                }
             }
             ChSrvTaskDetail chSrvTaskDetail = chSrvTaskDetailList.get(0);
             taskDetailId = chSrvTaskDetail.getTaskDetailId();