Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

tall/src/main/resources/application.yml

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

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -215,6 +215,8 @@ public enum  CodeEnum {
     PM_NOT_MEMBER(175,"项目经理下必须有一个成员",true),
     WisdomCar_NOT_Found(176,"没有找到绑定的平车信息",true),
     WISDOM_CAR_RUNNED(177,"这段时间内平车正在运行，请结束平车运行或重新选择平车",true),
+    WISDOM_CAR_IS_EXIST(178,"平车不存在,请检查后操作",true),
+    TASK_IS_EXIST(179,"任务不存在,请检查后操作",true),
     ;
 
 

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/PatientProjectDao.java

@@ -21,4 +21,11 @@ public interface PatientProjectDao extends PatientProjectMapper {
     List<PatientVo.PatientRecord> findPatientInfoByIdList(@Param("list") List<Long> newPatientIds);
 
     PatientAndFamilyVo.PatientInfo queryPatientInfo(@Param("projectId")Long projectId);
+
+    /**
+     * 查询项目id是否存在
+     * @param projectId 项目id
+     * @return 0不存在
+     */
+    Integer findPatientIsExist(@Param("id") Long projectId);
 }

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

@@ -28,4 +28,18 @@ public interface StepTaskDao extends StepTaskMapper {
      * @return 任务环节
      */
     StepTask getByCarAndStep(@Param("carId") Long carId, @Param("stepId") Long stepId, @Param("time") Long time);
+
+    /**
+     * 查询任务是否存在
+     * @param taskSubId 任务id
+     * @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/persist/dao/WisdomCarDao.java

@@ -24,4 +24,11 @@ public interface WisdomCarDao {
      * @return 次数
      */
     long countUsed(@Param("carId") Long carId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
+
+    /**
+     * 查询平车是否存在
+     * @param carId 平车id
+     * @return 0不存在
+     */
+    Integer findCarIsExist(@Param("id") Long carId);
 }

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

@@ -53,7 +53,7 @@ public class PatientAndFamilyService implements IPatientAndFamilyService{
     @Override
     public void updatePatientInfo(PatientAndFamilyDto.PatientInfo param) {
         PatientProject patient = patientProjectDao.selectByPrimaryKey(param.getId());
-        if (ObjectUtil.isNotNull(param)){
+        if (ObjectUtil.isNotNull(patient)){
             if (ObjectUtil.isNotNull(param.getName())){
                 patient.setName(param.getName());
             }

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

@@ -268,6 +268,31 @@ public class WisdomCarService implements IWisdomCarService {
 
     @Override
     public void bindingCar(WisdomCarDto.BindingCar param, Long userId) {
+        //查询平车id是否存在
+        Integer carIsExist = wisdomcarDao.findCarIsExist(param.getCarId());
+        if (0 == carIsExist){
+            throw new BaseException(CodeEnum.WISDOM_CAR_IS_EXIST);
+        }
+        //查询任务是否存在
+        Integer taskIsExist = stepTaskDao.findTaskIsExist(param.getTaskSubId());
+        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);
+        }
         // 判断平车是否在运行中
         long count = wisdomcarDao.countUsed(param.getCarId(), param.getStartTime(), param.getEndTime());
         if (count >0) {

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

@@ -36,4 +36,14 @@
         ORDER BY t_patient_project.created_at
         DESC LIMIT 1
     </select>
+
+    <select id="findPatientIsExist" resultType="Integer">
+        SELECT
+            COUNT(id)
+        FROM
+            t_patient_project
+        WHERE
+            project_id = #{id}
+        AND rec_status = 0
+    </select>
 </mapper>

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

@@ -26,4 +26,25 @@
         AND pc.start_time <= #{time} AND pc.end_time = 0 AND pc.start_time  + 2 * 60 * 60 * 1000 > #{time}
         order by pc.created_at desc limit 1
     </select>
+
+    <select id="findTaskIsExist" resultType="Integer">
+        SELECT
+            COUNT(id)
+        FROM
+            t_step_task
+        WHERE
+            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>

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

@@ -42,4 +42,16 @@ WHERE
 			 )
 			AND rec_status = 0
 	</select>
+
+	<select id="findCarIsExist" resultType="Integer">
+		SELECT
+			COUNT(id)
+		FROM
+			t_wisdom_car
+		WHERE
+			id = #{id}
+		AND rec_status = 0
+	</select>
+
+
 </mapper>