病案首页质控bug修正，增加批量通过的list

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -87,8 +87,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/dataimport/test").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportExcel").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresult").permitAll()
-                .antMatchers("/qc/behospitalInfo/exportQcresultByDept").permitAll()
-                .antMatchers("/qc/behospitalInfo/exportQcresultByGroup").permitAll()
                 .antMatchers("/qc/abnormal/getQcAnnormalMode").permitAll()
                 .antMatchers("/qc/dataimport/import").permitAll()
                 .antMatchers("/qc/dataimport/dataimportPrepare").permitAll()
@@ -230,7 +228,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/medNurse/getMedNursePage").permitAll()
                 .antMatchers("/qc/medRecordOther/getMedRecordOtherPage").permitAll()
                 .antMatchers("/qc/medRecordOther/getMedRecordContentOther").permitAll()
-                .antMatchers("/qc/behospitalInfo/exportQcresultByPerson").permitAll()
                 .antMatchers("/consoleByDept/beHosCountByDept").permitAll()
                 .antMatchers("/consoleByDept/casesEntryStatisticsByDept").permitAll()
                 .antMatchers("/bas/doctor/getList").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -163,8 +163,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/dataimport/test", request)
                 || matchers("/qc/behospitalInfo/exportExcel", request)
                 || matchers("/qc/behospitalInfo/exportQcresult", request)
-                || matchers("/qc/behospitalInfo/exportQcresultByDept", request)
-                || matchers("/qc/behospitalInfo/exportQcresultByGroup", request)
                 || matchers("/qc/abnormal/getQcAnnormalMode", request)
                 || matchers("/qc/dataimport/import", request)
                 || matchers("/qc/dataimport/dataimportPrepare", request)
@@ -306,7 +304,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/medNurse/getMedNursePage", request)
                 || matchers("/qc/medRecordOther/getMedRecordOtherPage", request)
                 || matchers("/qc/medRecordOther/getMedRecordContentOther", request)
-                || matchers("/qc/behospitalInfo/exportQcresultByPerson", request)
                 || matchers("/consoleByDept/beHosCountByDept", request)
                 || matchers("/consoleByDept/casesEntryStatisticsByDept", request)
                 || matchers("/bas/doctor/getList", request)

src/main/java/com/diagbot/facade/MedExamineInfoFacade.java

@@ -59,47 +59,45 @@ public class MedExamineInfoFacade extends MedExamineInfoServiceImpl {
     public boolean passAudit(BehospitalcodeVO behospitalcodeVO) {
         Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
         Long userId = Long.parseLong(SysUserUtils.getCurrentPrincipleID());
+        for (String behospitalCode : behospitalcodeVO.getBehospitalCodeList()) {
+            UpdateWrapper<BehospitalInfo> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("behospital_code", behospitalCode)
+                    .eq("hospital_id", behospitalcodeVO.getHospitalId())
+                    .eq("is_deleted", IsDeleteEnum.N)
+                    .set("status", "2");
+            behospitalInfoFacade.update(updateWrapper);
+
+            //获取判断是否有审核
+            QueryWrapper<MedExamineInfo> medExamineInfoQueryWrapper = new QueryWrapper<>();
+            medExamineInfoQueryWrapper.eq("behospital_code", behospitalCode);
+            medExamineInfoQueryWrapper.eq("hospital_id", hospitalId);
+            MedExamineInfo medExamineInfo = medExamineInfoFacade.getOne(medExamineInfoQueryWrapper);
+            SysUser user = sysUserFacade.getOne(new QueryWrapper<SysUser>()
+                    .eq("id", userId)
+                    .eq("is_deleted", IsDeleteEnum.N.getKey()));
+
+            if (medExamineInfo == null) {
+                MedExamineInfo insertCheckInfo = new MedExamineInfo();
+                insertCheckInfo.setBehospitalCode(behospitalCode);
+                insertCheckInfo.setCheckId(userId);
+                if (user != null) {
+                    insertCheckInfo.setCheckName(user.getLinkman());
+                }
+                insertCheckInfo.setAction(CheckTypeEnum.PASSED.getKey());
+                insertCheckInfo.setHospitalId(hospitalId);
+                insertCheckInfo.setStatus(1);
+                insertCheckInfo.setCheckTime(DateUtil.now());
+                return medExamineInfoFacade.save(insertCheckInfo);
+            }
 
-        UpdateWrapper<BehospitalInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("behospital_code", behospitalcodeVO.getBehospitalCode())
-                .eq("hospital_id", behospitalcodeVO.getHospitalId())
-                .eq("is_deleted", IsDeleteEnum.N)
-                .set("status", "2");
-        behospitalInfoFacade.update(updateWrapper);
-
-        //获取判断是否有审核
-        QueryWrapper<MedExamineInfo> medExamineInfoQueryWrapper = new QueryWrapper<>();
-        medExamineInfoQueryWrapper.eq("behospital_code", behospitalcodeVO.getBehospitalCode());
-        medExamineInfoQueryWrapper.eq("hospital_id", hospitalId);
-//        medCheckInfoQueryWrapper.eq("check_id", userId);
-//        medCheckInfoQueryWrapper.eq("check_type", CheckTypeEnum.ALL.getKey());
-        MedExamineInfo medExamineInfo = medExamineInfoFacade.getOne(medExamineInfoQueryWrapper);
-        SysUser user = sysUserFacade.getOne(new QueryWrapper<SysUser>()
-                .eq("id", userId)
-                .eq("is_deleted", IsDeleteEnum.N.getKey()));
-
-        if (medExamineInfo == null) {
-            MedExamineInfo insertCheckInfo = new MedExamineInfo();
-            insertCheckInfo.setBehospitalCode(behospitalcodeVO.getBehospitalCode());
-            insertCheckInfo.setCheckId(userId);
+            medExamineInfo.setCheckId(userId);
             if (user != null) {
-                insertCheckInfo.setCheckName(user.getLinkman());
+                medExamineInfo.setCheckName(user.getLinkman());
             }
-            insertCheckInfo.setAction(CheckTypeEnum.PASSED.getKey());
-            insertCheckInfo.setHospitalId(hospitalId);
-            insertCheckInfo.setStatus(1);
-            insertCheckInfo.setCheckTime(DateUtil.now());
-            return medExamineInfoFacade.save(insertCheckInfo);
-        }
-
-        medExamineInfo.setCheckId(userId);
-        if (user != null) {
-            medExamineInfo.setCheckName(user.getLinkman());
+            medExamineInfo.setStatus(1);
+            medExamineInfo.setCheckTime(DateUtil.now());
+            medExamineInfoFacade.updateById(medExamineInfo);
         }
-        medExamineInfo.setStatus(1);
-        medExamineInfo.setCheckTime(DateUtil.now());
-        medExamineInfoFacade.updateById(medExamineInfo);
-
         return true;
     }
 
@@ -194,7 +192,7 @@ public class MedExamineInfoFacade extends MedExamineInfoServiceImpl {
      * @Description 驳回记录插入
      * @Return Boolean
      */
-    private Boolean addmedRejectedInfo(RejectedVo rejectedVo,String doctorId) {
+    private Boolean addmedRejectedInfo(RejectedVo rejectedVo, String doctorId) {
         try {
             MedRejectedInfo medRejectedInfo = new MedRejectedInfo();
             BeanUtils.copyProperties(rejectedVo, medRejectedInfo);
@@ -223,6 +221,14 @@ public class MedExamineInfoFacade extends MedExamineInfoServiceImpl {
                 .set("status", "5");
         behospitalInfoFacade.update(updateWrapper);
 
+        // 获取病历信息
+        BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
+                .eq("behospital_code", medAppealInfoVO.getBehospitalCode())
+                .eq("hospital_id", medAppealInfoVO.getHospitalId())
+                .eq("is_deleted", IsDeleteEnum.N));
+
+        medAppealInfoVO.setClaimantId(behospitalInfo.getDoctorId());
+        medAppealInfoVO.setClaimantName(behospitalInfo.getDoctorName());
         //获取该病历缺陷申诉记录(医院id+病历id+质控缺陷id+未删除)
         List<MedAppealInfo> medAppealInfos = medAppealInfoFacade.list(new QueryWrapper<MedAppealInfo>()
                 .eq("hospital_id", medAppealInfoVO.getHospitalId())

src/main/java/com/diagbot/facade/QcClientFacade.java

@@ -33,7 +33,8 @@ public class QcClientFacade {
         if (StringUtil.isBlank(url)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "配置表内找不到评分接口地址数据！");
         }
-        url = "http://127.0.0.1:6660";
+//        url = "http://127.0.0.1:6660";
+        url = "http://173.18.12.195:6660";
         try {
             uri = new URI(url);
         } catch (Exception e) {

src/main/java/com/diagbot/facade/QcresultInfoFacade.java

@@ -307,19 +307,6 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 );
                 break;
             case 4:
-                //获取病历核查人员id，该操作只能是核查员操作
-//                Long checkId = medCheckInfoFacade.getOne(new QueryWrapper<MedCheckInfo>()
-//                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-//                        .eq("hospital_id", analyzeVO.getHospitalId())
-//                        .eq("behospital_code", analyzeVO.getBehospitalCode())).getCheckId();
-//                if(checkId==null)
-//                {
-//                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "病历没有分配核查人员");
-//                }
-//                if(!checkId.equals(useId))
-//                {
-//                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "当前用户不是分配的核查人员");
-//                }
                 //逻辑删除质控明细 0删除
                 if (analyzeVO.getDelStatus() == 0) {
                     qcresultDetailServiceImpl.update(new UpdateWrapper<QcresultDetail>()

src/main/java/com/diagbot/vo/BehospitalcodeVO.java

@@ -2,8 +2,9 @@ package com.diagbot.vo;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @description:
@@ -13,9 +14,11 @@ import javax.validation.constraints.NotNull;
 @Data
 public class BehospitalcodeVO {
 
-    @NotBlank(message = "behospitalCode不能为空")
     private String behospitalCode; // 病历id
 
+    // 指定编码列表
+    private List<String> behospitalCodeList = new ArrayList<>();
+
     @NotNull(message = "hospitalId不能为空")
     private Long hospitalId; //医院ID
 

src/main/java/com/diagbot/vo/MedAppealInfoVO.java

@@ -46,6 +46,9 @@ public class MedAppealInfoVO {
     @ApiModelProperty(value = "申诉人id")
     private String claimantId;
 
+    @ApiModelProperty(value = "申诉人姓名")
+    private String claimantName;
+
     @ApiModelProperty(value = "申诉说明", required = true)
     @NotBlank(message = "申诉说明不能为空")
     private String appealExplain;

src/main/java/com/diagbot/web/MedExamineInfoController.java

@@ -59,8 +59,6 @@ public class MedExamineInfoController {
     @PostMapping("/addAppealInfo")
     @Transactional
     public RespDTO<Boolean> addAppealInfo(@RequestBody @Valid MedAppealInfoVO medAppealInfoVO) {
-        medAppealInfoVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
-        medAppealInfoVO.setClaimantId(SysUserUtils.getCurrentPrincipleID());
         return RespDTO.onSuc(medExamineInfoFacade.addAppealInfo(medAppealInfoVO));
     }
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -60,7 +60,14 @@
         b.grade_type,
         b.score_res,
         b.gmt_create AS grade_time,
-        a.`status`,
+        CASE a.`status`
+        WHEN 1 THEN '待审核'
+        WHEN 2 THEN '已通过'
+        WHEN 3 THEN '已驳回'
+        WHEN 4 THEN '未申诉'
+        WHEN 5 THEN '已申诉'
+        ELSE '未知状态'
+        END AS `status`,  -- 保持字段名不变
         CONCAT(IFNULL(c.age, ''), IFNULL(c.age_unit, '')) AS age,
         (
         SELECT