20210901v1.3

src/main/java/com/ccsens/carbasics/api/PatientController.java

@@ -97,9 +97,9 @@ public class PatientController {
     @MustLogin
     @ApiOperation(value = "秘书修改审核状态", notes = "zy")
     @RequestMapping(value = "/updateBySecretary", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<PageInfo<PatientVo.PatientListByQuality>> updateStatusBySecretary(@ApiParam @Validated @RequestBody QueryDto<PatientDto.QueryListByQuality> params) throws Exception{
+    public JsonResponse updateStatusBySecretary(@ApiParam @Validated @RequestBody QueryDto<PatientDto.StatusBySecretary> params) throws Exception{
         log.info("秘书修改审核状态：{}", params);
-        firstAidService.queryPatientListBySecretary(params.getParam(), params.getUserId());
+        firstAidService.updateStatusBySecretary(params.getParam(), params.getUserId());
         log.info("秘书修改审核状态成功");
         return JsonResponse.newInstance().ok();
     }

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

@@ -190,4 +190,15 @@ public class PatientDto {
         @Max(value=100)
         private int pageSize = 10;
     }
+
+
+    @Data
+    @ApiModel("秘书修改急救状态")
+    public static class StatusBySecretary{
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
+        @ApiModelProperty("急救状态  0:通过  6:申请拒绝")
+        private byte dataStatus;
+    }
+
 }

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

@@ -160,7 +160,7 @@ public class FirstAidService implements IFirstAidService{
         FirstAidRecord firstAidRecord = new FirstAidRecord();
         firstAidRecord.setId(snowflake.nextId());
         firstAidRecord.setFirstAidId(firstAid.getId());
-        firstAidRecord.setQuestionCode("CJBL-YSBL");
+        firstAidRecord.setQuestionCode(Constant.QuestionCode.CJBL_YSBL);
         firstAidRecord.setAnswer(param.getSuspected());
         firstAidRecord.setSubmitUserId(userId);
         firstAidRecord.setSubmitUserType((byte) 1);
@@ -197,7 +197,7 @@ public class FirstAidService implements IFirstAidService{
             throw new BaseException(DefaultCodeError.NOT_FIRST_AID_ID);
         }
         //判断急救状态
-        if(firstAid.getDataStatus() == 1 || firstAid.getDataStatus() == 3){
+        if(firstAid.getDataStatus() == Constant.DataStatus.FirstAidPass.status || firstAid.getDataStatus() == Constant.DataStatus.DischargePass.status){
             throw new BaseException(DefaultCodeError.NO_POWER);
         }
         //判断操作人的权限
@@ -227,7 +227,7 @@ public class FirstAidService implements IFirstAidService{
             //修改急救记录信息
             FirstAidRecord firstAidRecord = new FirstAidRecord();
             FirstAidRecordExample recordExample = new FirstAidRecordExample();
-            recordExample.createCriteria().andFirstAidIdEqualTo(param.getFirstAidId()).andQuestionCodeEqualTo("CJBL-YSBL");
+            recordExample.createCriteria().andFirstAidIdEqualTo(param.getFirstAidId()).andQuestionCodeEqualTo(Constant.QuestionCode.CJBL_YSBL);
             List<FirstAidRecord> firstAidRecords = firstAidRecordMapper.selectByExample(recordExample);
             if(CollectionUtil.isNotEmpty(firstAidRecords)){
                 firstAidRecord = firstAidRecords.get(0);
@@ -235,7 +235,7 @@ public class FirstAidService implements IFirstAidService{
                 firstAidRecordMapper.updateByPrimaryKeySelective(firstAidRecord);
             }else {
                 firstAidRecord.setId(snowflake.nextId());
-                firstAidRecord.setQuestionCode("CJBL-YSBL");
+                firstAidRecord.setQuestionCode(Constant.QuestionCode.CJBL_YSBL);
                 firstAidRecord.setFirstAidId(firstAid.getId());
                 firstAidRecord.setAnswer(param.getSuspected());
                 firstAidRecord.setSubmitUserId(userId);
@@ -261,7 +261,7 @@ public class FirstAidService implements IFirstAidService{
         OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
         //用户的科室必须是医院的科室
         Organization organization = organizationDao.selectByPrimaryKey(memberPosition.getOrganizationId());
-        if(organization.getOrganizationType() != 3){
+        if(organization.getOrganizationType() != Constant.OrganizationType.HOSPITAL.status){
             throw new BaseException(DefaultCodeError.NO_HOSPITAL);
         }
         //根据科室查找模板
@@ -294,4 +294,26 @@ public class FirstAidService implements IFirstAidService{
         List<PatientVo.PatientListByQuality> patientList = firstAidDao.queryPatientListBySecretary(hospitalList,param);
         return new PageInfo<>(patientList);
     }
+
+    @Override
+    public void updateStatusBySecretary(PatientDto.StatusBySecretary param, Long userId) {
+        //判断当前用户的职位是否是秘书
+        OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
+        if(!memberPosition.getPositionCode().equalsIgnoreCase(Constant.Position.MI_SHU)){
+            throw new BaseException(DefaultCodeError.NO_POWER);
+        }
+        //查找急救记录
+        FirstAid firstAid = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
+        if(ObjectUtil.isNull(firstAid)){
+            throw new BaseException(DefaultCodeError.NOT_FIRST_AID_ID);
+        }
+        //判断当前病例的状态和要修改的是否一致
+        if(firstAid.getDataStatus() == param.getDataStatus()){
+            return;
+        }
+        if(firstAid.getDataStatus() == Constant.DataStatus.ApplyFor.status){
+            firstAid.setDataStatus(param.getDataStatus());
+            firstAidDao.updateByPrimaryKeySelective(firstAid);
+        }
+    }
 }

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

@@ -51,4 +51,11 @@ public interface IFirstAidService {
      * @return 返回急救信息列表
      */
     PageInfo<PatientVo.PatientListByQuality> queryPatientListBySecretary(PatientDto.QueryListByQuality param, Long userId);
+
+    /**
+     * 秘书修改急救状态
+     * @param param 修改的状态
+     * @param userId userId
+     */
+    void updateStatusBySecretary(PatientDto.StatusBySecretary param, Long userId);
 }

src/main/java/com/ccsens/carbasics/util/Constant.java

@@ -31,11 +31,30 @@ public class Constant {
         public static final String HU_SHI = "HuShi";
         /**医生*/
         public static final String YI_SHENG = "YiSheng";
+        /**秘书*/
+        public static final String MI_SHU = "MiShu";
     }
+    public enum OrganizationType {
+        /**
+         * 职位归属 0：省卫健委 1：省质控 2：市质控 3：医院'
+         */
+        SWJW((byte) 0,"省卫健委"),
+        PROVINCE_QUALITY((byte) 1,"省质控"),
+        CITY_QUALITY((byte) 2,"市质控"),
+        HOSPITAL((byte) 3,"医院")
+        ;
+        public byte status;
+        public String message;
 
+        OrganizationType(byte status, String message) {
+            this.status = status;
+            this.message = message;
+        }
+
+    }
     public enum DataStatus {
         /**
-         *
+         * 病例状态
          */
         Create((byte) 0,"创建"),
         FirstAidPass((byte) 1,"急救审核通过"),
@@ -108,6 +127,8 @@ public class Constant {
         public static final String JMRSSJ = "JMRSSJ";
         /**CT开始时间*/
         public static final String CT_START = "CT-START";
+        /**意思诊断*/
+        public static final String CJBL_YSBL = "CJBL-YSBL";
     }