权限

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

@@ -42,13 +42,9 @@ public class FirstAidRecordService implements IFirstAidRecordService {
     @Resource
     private FirstAidRecordDao firstAidRecordDao;
     @Resource
-    private CodeDictionariesMapper dictionariesMapper;
-    @Resource
     private CodeParentDao codeParentDao;
     @Resource
     private FirstAidDao firstAidDao;
-    @Resource
-    private FirstAidLogDao firstAidLogDao;
 
 
     @Override
@@ -61,7 +57,7 @@ public class FirstAidRecordService implements IFirstAidRecordService {
     @Override
     public PatientVo.QueryAidRecordN queryAidRecordN(PatientDto.QueryAidRecord param, Long userId) {
         PatientVo.QueryAidRecordN queryAidRecord = new PatientVo.QueryAidRecordN();
-        Map<String,List<String>> recordMap = new HashMap<>();
+        Map<String,List<String>> recordMap = new HashMap<>(16);
         //查询记录信息
         List<PatientVo.AidRecord> aidRecords = patientDao.queryRecordByAidId(param.getProjectId(),param.getCodeList());
         if(CollectionUtil.isNotEmpty(aidRecords)){
@@ -119,9 +115,7 @@ public class FirstAidRecordService implements IFirstAidRecordService {
                 //判断答案是否为空
                 if(CollectionUtil.isNotEmpty(codeAndAnswer.getAnswer())){
                     //循环答案
-                    codeAndAnswer.getAnswer().forEach(answer -> {
+                    codeAndAnswer.getAnswer().forEach(answer -> saveRecord(param.getUserType(), userId, firstAid.getId(), codeAndAnswer.getQuestionCode(), StrUtil.isBlank(answer) ? "" : answer,param.getProjectId()));
-                        saveRecord(param.getUserType(), userId, firstAid.getId(), codeAndAnswer.getQuestionCode(), StrUtil.isBlank(answer) ? "" : answer,param.getProjectId());
-                    });
                 }else {
                     saveRecord(param.getUserType(), userId, firstAid.getId(), codeAndAnswer.getQuestionCode(), "",param.getProjectId());
                 }
@@ -188,37 +182,38 @@ public class FirstAidRecordService implements IFirstAidRecordService {
                 }
             });
         } else if (firstAid.getDataStatus() == Constant.DataStatus.DischargeRefuse.status) {
-            // 出院审核拒绝，只允许修改出院信息
+            // 出院审核拒绝，只允许修改出院信息 ×  出院审核拒绝，数据全部可以修改
-            pageChildCode(param);
+            // pageChildCode(param);
-        } else if (firstAid.getDataStatus() == Constant.DataStatus.ApplyFor.status
+            log.info("出院审核拒绝，数据都可以修改");
-            || firstAid.getDataStatus() == Constant.DataStatus.ApplyForRefuse.status){
+//        } else if (firstAid.getDataStatus() == Constant.DataStatus.ApplyFor.status
-            // 申请修改/修改拒绝
+//            || firstAid.getDataStatus() == Constant.DataStatus.ApplyForRefuse.status){
-            // 出院是否审核通过过
+//            // 申请修改/修改拒绝（只有出院审核通过可以申请修改，一旦申请修改，不允许修改）
-            FirstAidLogExample logExample = new FirstAidLogExample();
+//            // 出院是否审核通过过
-            logExample.createCriteria().andFirstAidIdEqualTo(firstAid.getId())
+//            FirstAidLogExample logExample = new FirstAidLogExample();
-                    .andOperationTypeEqualTo(Constant.DataStatus.DischargePass.status);
+//            logExample.createCriteria().andFirstAidIdEqualTo(firstAid.getId())
-            long l = firstAidLogDao.countByExample(logExample);
+//                    .andOperationTypeEqualTo(Constant.DataStatus.DischargePass.status);
-            if (l > 0) {
+//            long l = firstAidLogDao.countByExample(logExample);
-                // 有，则都不修改
+//            if (l > 0) {
-                throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
+//                // 有，则都不修改
-            } else {
+//                throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
-                pageChildCode(param);
+//            } else {
-            }
+//                pageChildCode(param);
+//            }
         } else {
-            // 出院通过
+            // 出院审核通过 申请修改 申请拒绝
             throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
         }
     }
 
-    private void pageChildCode(PatientDto.SaveAidRecordN param) {
+//    private void pageChildCode(PatientDto.SaveAidRecordN param) {
-        List<String> children = codeParentDao.queryChildren(Constant.QuestionCode.DISCHARGE);
+//        List<String> children = codeParentDao.queryChildren(Constant.QuestionCode.DISCHARGE);
-        param.getCodeAndAnswerList().forEach(codeAndAnswer -> {
+//        param.getCodeAndAnswerList().forEach(codeAndAnswer -> {
-            if (!children.contains(codeAndAnswer.getQuestionCode())) {
+//            if (!children.contains(codeAndAnswer.getQuestionCode())) {
-                log.info("{}不是出院的code，不能修改", codeAndAnswer.getQuestionCode() );
+//                log.info("{}不是出院的code，不能修改", codeAndAnswer.getQuestionCode() );
-                throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
+//                throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
-            }
+//            }
-        });
+//        });
-    }
+//    }
 
     private void saveRecord(byte userType, Long userId, Long firstAidId, String code, String answer,Long projectId) {
         //添加日志表,不管数据是否重复