绑定平车代码修改

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: util-prod,common
+    active: dev
+    include: util-dev,common
 

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java

@@ -24,16 +24,16 @@ public class WisdomCarDto {
     @Data
     @ApiModel("绑定平车")
     public static class BindingCar {
-        @NotNull
+        @NotNull(message="平车ID不能为空")
         @ApiModelProperty("平车ID")
         private Long carId;
-        @NotNull
+        @NotNull(message="项目ID不能为空")
         @ApiModelProperty("项目ID")
         private Long projectId;
+        @NotNull(message="分解任务ID不能为空")
         @ApiModelProperty("分解任务ID")
-        @NotNull
         private Long taskSubId;
-        @NotNull
+        @NotNull(message="开始时间不能为空")
         @Min(1)
         @ApiModelProperty("开始时间")
         private Long startTime;

wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepTaskDao.java

@@ -35,4 +35,11 @@ public interface StepTaskDao extends StepTaskMapper {
      * @return 0不存在
      */
     Integer findTaskIsExist(@Param("id") Long taskSubId);
+
+    /**
+     * 查询任务是否是分诊环节的任务ID
+     * @param taskSubId 任务id
+     * @return 0不存在
+     */
+    Integer findTaskIsTriageTask(Long taskSubId);
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@@ -278,12 +278,18 @@ public class WisdomCarService implements IWisdomCarService {
         if (0 == taskIsExist){
             throw new BaseException(CodeEnum.TASK_IS_EXIST);
         }
+        //查询任务是否是分诊环节的任务ID
+        Integer taskIsTriageTask = stepTaskDao.findTaskIsTriageTask(param.getTaskSubId());
+        if (0 == taskIsTriageTask){
+            throw new BaseException(CodeEnum.PARAM_ERROR);
+        }
         //查询患者是否存在
         Integer patientIsExist = patientProjectDao.findPatientIsExist(param.getProjectId());
         if (0 == patientIsExist){
             throw new BaseException(Constant.PATIENT_NOT_FOUND);
         }
         //开始时间不能大于当前时间,结束时间不能小于开始时间
+        System.out.println(System.currentTimeMillis());
         if (param.getEndTime() < param.getStartTime() || param.getStartTime() > System.currentTimeMillis()){
             throw new BaseException(CodeEnum.PARAM_ERROR);
         }

wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml

@@ -36,4 +36,15 @@
             task_sub_id = #{id}
         AND rec_status = 0
     </select>
+
+    <select id="findTaskIsTriageTask" resultType="Integer">
+        SELECT
+            COUNT(id)
+        FROM
+            t_step_task
+        WHERE
+            task_sub_id = #{id}
+        AND step_id = 29
+        AND rec_status = 0
+    </select>
 </mapper>