修改查询/修改急救信息接口的入参,改为急救id

src/main/java/com/ccsens/carbasics/bean/dto/FirstAidDto.java

@@ -54,7 +54,9 @@ public class FirstAidDto {
     @Data
     @ApiModel("查询项目详情--请求")
     public static class Project{
-        @ApiModelProperty("项目ID")
-        private Long projectId;
+//        @ApiModelProperty("项目ID")
+//        private Long projectId;
+        @ApiModelProperty("急救ID")
+        private Long firstAidId;
     }
 }

src/main/java/com/ccsens/carbasics/bean/dto/PatientDto.java

@@ -66,9 +66,12 @@ public class PatientDto {
     @Data
     @ApiModel("批量查询急救记录")
     public static class QueryAidRecord{
-        @NotNull(message = "项目id不能为空")
-        @ApiModelProperty("项目id")
-        private Long projectId;
+//        @NotNull(message = "项目id不能为空")
+//        @ApiModelProperty("项目id")
+//        private Long projectId;
+        @NotNull(message = "急救id不能为空")
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
         @ApiModelProperty("code列表")
         private List<String> codeList;
     }
@@ -89,9 +92,12 @@ public class PatientDto {
     @Data
     @ApiModel("添加急救记录信息")
     public static class SaveAidRecordN{
-        @NotNull(message = "项目id不能为空")
-        @ApiModelProperty("项目id")
-        private Long projectId;
+//        @NotNull(message = "项目id不能为空")
+//        @ApiModelProperty("项目id")
+//        private Long projectId;
+        @NotNull(message = "急救id不能为空")
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
         @Max(value=1,message = "请查询正确的提交人类型")
         @ApiModelProperty("提交人类型（0平车 1人）")
         private byte userType = 1;
@@ -136,9 +142,12 @@ public class PatientDto {
     @Data
     @ApiModel("项目id")
     public static class ProjectId{
-        @NotNull(message = "请传入项目id")
-        @ApiModelProperty("项目id")
-        private Long projectId;
+//        @NotNull(message = "请传入项目id")
+//        @ApiModelProperty("项目id")
+//        private Long projectId;
+        @NotNull(message = "请传入急救id")
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
     }
 
     @Data

src/main/java/com/ccsens/carbasics/persist/dao/PatientDao.java

@@ -14,11 +14,11 @@ public interface PatientDao extends FirstAidRecordMapper {
 
     /**
      * 根据急救id查询记录信息
-     * @param projectId 急救id
+     * @param firstAidId 急救id
      * @param codeList code
      * @return 返回急救信息
      */
-    List<PatientVo.AidRecord> queryRecordByAidId(@Param("projectId") Long projectId, @Param("codeList") List<String> codeList);
+    List<PatientVo.AidRecord> queryRecordByAidId(@Param("firstAidId") Long firstAidId, @Param("codeList") List<String> codeList);
 
     /**
      * 查找code下的总数量和完成数据

src/main/java/com/ccsens/carbasics/service/FirstAidRecordService.java

@@ -67,7 +67,7 @@ public class FirstAidRecordService implements IFirstAidRecordService {
         PatientVo.QueryAidRecordN queryAidRecord = new PatientVo.QueryAidRecordN();
         Map<String,List<String>> recordMap = new HashMap<>(16);
         //查询记录信息
-        List<PatientVo.AidRecord> aidRecords = patientDao.queryRecordByAidId(param.getProjectId(),param.getCodeList());
+        List<PatientVo.AidRecord> aidRecords = patientDao.queryRecordByAidId(param.getFirstAidId(),param.getCodeList());
         if(CollectionUtil.isNotEmpty(aidRecords)){
             //封装进map内
             aidRecords.forEach(aidRecord -> {
@@ -88,25 +88,26 @@ public class FirstAidRecordService implements IFirstAidRecordService {
     @Override
     public void saveAidRecordN(PatientDto.SaveAidRecordN param, Long userId) {
         //验证急救信息
-        FirstAidExample aidExample = new FirstAidExample();
-        aidExample.createCriteria().andProjectIdEqualTo(param.getProjectId());
-        aidExample.setOrderByClause("id desc limit 1");
-        List<FirstAid> firstAids = firstAidDao.selectByExample(aidExample);
+//        FirstAidExample aidExample = new FirstAidExample();
+//        aidExample.createCriteria().andProjectIdEqualTo(param.getProjectId());
+//        aidExample.setOrderByClause("id desc limit 1");
+//        List<FirstAid> firstAids = firstAidDao.selectByExample(aidExample);
+        FirstAid firstAids = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
         log.info("急救信息：{}", firstAids);
-        if(CollectionUtil.isEmpty(firstAids)) {
+        if(ObjectUtil.isNull(firstAids)) {
             throw new BaseException(DefaultCodeError.NOT_FIRST_AID_ID);
         }
 
         if(CollectionUtil.isEmpty(param.getCodeAndAnswerList())){
             return;
         }
-        FirstAid firstAid = firstAids.get(0);
+//        FirstAid firstAid = firstAids.get(0);
 
         // 判断权限状态
-        aidStatus(param, firstAid);
+        aidStatus(param, firstAids);
         //遍历传入的code
         // 时间校验
-        checkTime(param, firstAid);
+        checkTime(param, firstAids);
         // 保存
         param.getCodeAndAnswerList().forEach(codeAndAnswer -> {
             if(StrUtil.isEmpty(codeAndAnswer.getQuestionCode())) {
@@ -115,7 +116,7 @@ public class FirstAidRecordService implements IFirstAidRecordService {
             }
             //添加记录表，需要查找之前的记录，删除后重新添加
             FirstAidRecordExample recordExample = new FirstAidRecordExample();
-            recordExample.createCriteria().andFirstAidIdEqualTo(firstAid.getId()).andQuestionCodeEqualTo(codeAndAnswer.getQuestionCode());
+            recordExample.createCriteria().andFirstAidIdEqualTo(firstAids.getId()).andQuestionCodeEqualTo(codeAndAnswer.getQuestionCode());
             List<FirstAidRecord> firstAidRecords = firstAidRecordDao.selectByExample(recordExample);
             if (CollectionUtil.isNotEmpty(firstAidRecords)) {
                 firstAidRecords.forEach(firstAidRecord -> {
@@ -126,14 +127,14 @@ public class FirstAidRecordService implements IFirstAidRecordService {
             //判断答案是否为空
             if(CollectionUtil.isNotEmpty(codeAndAnswer.getAnswer())){
                 //循环答案
-                codeAndAnswer.getAnswer().forEach(answer -> saveRecord(param.getUserType(), userId, firstAid.getId(), codeAndAnswer.getQuestionCode(), StrUtil.isBlank(answer) ? "" : answer,param.getProjectId()));
+                codeAndAnswer.getAnswer().forEach(answer -> saveRecord(param.getUserType(), userId, firstAids.getId(), codeAndAnswer.getQuestionCode(), StrUtil.isBlank(answer) ? "" : answer,firstAids.getProjectId()));
             }else {
-                saveRecord(param.getUserType(), userId, firstAid.getId(), codeAndAnswer.getQuestionCode(), "",param.getProjectId());
+                saveRecord(param.getUserType(), userId, firstAids.getId(), codeAndAnswer.getQuestionCode(), "",firstAids.getProjectId());
             }
 
             if (Constant.QuestionCode.QZSJ.equals(codeAndAnswer.getQuestionCode())
                     || Constant.QuestionCode.THSJ.equals(codeAndAnswer.getQuestionCode())) {
-                sendQcp(firstAid.getHospitalId(), codeAndAnswer, userId);
+                sendQcp(firstAids.getHospitalId(), codeAndAnswer, userId);
 
             }
         });

src/main/java/com/ccsens/carbasics/service/FirstAidService.java

@@ -224,20 +224,21 @@ public class FirstAidService implements IFirstAidService{
     public PatientVo.GetPatient getPatient(PatientDto.ProjectId param, Long userId) {
         PatientVo.GetPatient getPatient = new PatientVo.GetPatient();
         //通过项目id查找急救信息
-        FirstAidExample firstAidExample = new FirstAidExample();
-        firstAidExample.createCriteria().andProjectIdEqualTo(param.getProjectId());
-        List<FirstAid> firstAids = firstAidDao.selectByExample(firstAidExample);
-        if(CollectionUtil.isNotEmpty(firstAids)){
-            getPatient.setFirstAidId(firstAids.get(0).getId());
-            getPatient.setName(firstAids.get(0).getName());
-            getPatient.setGender(firstAids.get(0).getGender());
-            getPatient.setNation(firstAids.get(0).getNation());
-            getPatient.setIdcard(firstAids.get(0).getIdcard());
-            getPatient.setProjectId(firstAids.get(0).getProjectId());
-            getPatient.setAge(firstAids.get(0).getAge());
+//        FirstAidExample firstAidExample = new FirstAidExample();
+//        firstAidExample.createCriteria().andProjectIdEqualTo(param.getProjectId());
+//        List<FirstAid> firstAids = firstAidDao.selectByExample(firstAidExample);
+        FirstAid firstAid = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
+        if(ObjectUtil.isNotNull(firstAid)){
+            getPatient.setFirstAidId(firstAid.getId());
+            getPatient.setName(firstAid.getName());
+            getPatient.setGender(firstAid.getGender());
+            getPatient.setNation(firstAid.getNation());
+            getPatient.setIdcard(firstAid.getIdcard());
+            getPatient.setProjectId(firstAid.getProjectId());
+            getPatient.setAge(firstAid.getAge());
             // 查找疑似病例
             FirstAidRecordExample recordExample = new FirstAidRecordExample();
-            recordExample.createCriteria().andFirstAidIdEqualTo(firstAids.get(0).getId()).andQuestionCodeEqualTo(Constant.QuestionCode.CJBL_YSBL);
+            recordExample.createCriteria().andFirstAidIdEqualTo(firstAid.getId()).andQuestionCodeEqualTo(Constant.QuestionCode.CJBL_YSBL);
             recordExample.setOrderByClause("id desc limit 1");
             List<FirstAidRecord> firstAidRecords = firstAidRecordMapper.selectByExample(recordExample);
             if (CollectionUtil.isNotEmpty(firstAidRecords)) {
@@ -666,18 +667,18 @@ public class FirstAidService implements IFirstAidService{
 
     @Override
     public FirstAidVo.FirstAidBase getDetail(FirstAidDto.Project param, Long userId) {
-        FirstAidExample example = new FirstAidExample();
-        example.createCriteria().andProjectIdEqualTo(param.getProjectId());
-        example.setOrderByClause("id desc limit 1");
-        List<FirstAid> firstAids = firstAidDao.selectByExample(example);
-        if (CollectionUtil.isEmpty(firstAids)) {
+//        FirstAidExample example = new FirstAidExample();
+//        example.createCriteria().andProjectIdEqualTo(param.getProjectId());
+//        example.setOrderByClause("id desc limit 1");
+//        List<FirstAid> firstAids = firstAidDao.selectByExample(example);
+        FirstAid firstAids = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
+        if (ObjectUtil.isNull(firstAids)) {
             return null;
         }
-        FirstAid firstAid = firstAids.get(0);
         FirstAidVo.FirstAidBase detail = new FirstAidVo.FirstAidBase();
-        detail.setProjectId(firstAid.getProjectId());
-        detail.setType(firstAid.getType());
-        detail.setValueType(firstAid.getValueType());
+        detail.setProjectId(firstAids.getProjectId());
+        detail.setType(firstAids.getType());
+        detail.setValueType(firstAids.getValueType());
         return detail;
     }
 

src/main/resources/mapper_dao/PatientDao.xml

@@ -11,7 +11,7 @@
 		t_qcp_first_aid a LEFT JOIN
         t_qcp_first_aid_record r on a.id = r.first_aid_id and r.rec_status = 0
         WHERE
-        a.project_id = #{projectId}
+        a.id = #{firstAidId}
         <if test="codeList != null and codeList.size() > 0">
             AND r.question_code in
             <foreach collection="codeList" item="code" separator="," open="(" close=")">