修改评分bug

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

@@ -154,7 +154,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     QcresultDetailFacade qcresultDetailFacade;
 
 
-
     /**
      * 分页
      *
@@ -261,9 +260,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             }
             res.put("result", qcResultDTO);
             //通过页面类型显示不同操作按钮
-            showButtonByPageType(hospitalId,getDetailVO,res);
+            showButtonByPageType(hospitalId, getDetailVO, res);
             //添加核查操作是否与申诉状态关联配置
-            res.put("checkOperationWithAppeal",sysHospitalSetFacade.getValue(hospitalId,"check_operation_with_appeal"));
+            res.put("checkOperationWithAppeal", sysHospitalSetFacade.getValue(hospitalId, "check_operation_with_appeal"));
         }
 
         // 获取提示信息
@@ -310,7 +309,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return res;
     }
 
-    private void showButtonByPageType(Long hospitalId, GetDetailVO getDetailVO,Map<String, Object> res) {
+    private void showButtonByPageType(Long hospitalId, GetDetailVO getDetailVO, Map<String, Object> res) {
 //        switch (getDetailVO.getPageType()){
 //            case "1":
 //                break;
@@ -323,8 +322,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 //            default:
 //                break;
 //        }
-        checkButtonShow(hospitalId,getDetailVO,res);
-        appealButtonShow(hospitalId,getDetailVO,res);
+        checkButtonShow(hospitalId, getDetailVO, res);
+        appealButtonShow(hospitalId, getDetailVO, res);
     }
 
     private void appealButtonShow(Long hospitalId, GetDetailVO getDetailVO, Map<String, Object> res) {
@@ -2363,28 +2362,37 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             if (ListUtil.isNotEmpty(informList)) {
                 informList.forEach(obj ->
                         {
-                            Map<String, String> strMap = new HashMap<>();
-                            strMap.put("使用植入性材料", String.valueOf(obj.get("使用植入性材料")));
-                            StrInformedConsent strInformedConsent = new StrInformedConsent();
-                            strInformedConsent.setHospitalId(analyzeVO.getHospitalId());
-                            strInformedConsent.setBehospitalCode(analyzeVO.getBehospitalCode());
-                            strInformedConsent.setRecId(String.valueOf(obj.get("记录编号")));
-                            strInformedConsent.setRecTitle(String.valueOf(obj.get("病历标题")));
-                            strInformedConsent.setRecType("知情同意书");
-                            strInformedConsent.setContent(JSONObject.toJSONString(strMap));
-                            strInformedConsent.setGmtCreate(new Date());
-                            strInformedConsents.add(strInformedConsent);
-                            recIds.add(String.valueOf(obj.get("记录编号")));
+                            if (obj.containsKey("病历标题")
+                                    && obj.containsKey("记录编号")
+                                    && obj.containsKey("记录编号")
+                                    && obj.containsKey("使用植入性材料")) {
+                                Map<String, String> strMap = new HashMap<>();
+                                strMap.put("使用植入性材料", String.valueOf(obj.get("使用植入性材料")));
+                                StrInformedConsent strInformedConsent = new StrInformedConsent();
+                                strInformedConsent.setHospitalId(analyzeVO.getHospitalId());
+                                strInformedConsent.setBehospitalCode(analyzeVO.getBehospitalCode());
+                                strInformedConsent.setRecId(String.valueOf(obj.get("记录编号")));
+                                strInformedConsent.setRecTitle(String.valueOf(obj.get("病历标题")));
+                                strInformedConsent.setRecType("知情同意书");
+                                strInformedConsent.setContent(JSONObject.toJSONString(strMap));
+                                strInformedConsent.setGmtCreate(new Date());
+                                strInformedConsents.add(strInformedConsent);
+                                recIds.add(String.valueOf(obj.get("记录编号")));
+                            }
                         }
                 );
-                //删除手术知情同意书历史ric_id
-                strInformedConsentServiceImpl.remove(new QueryWrapper<StrInformedConsent>()
-                        .eq("hospital_id", analyzeVO.getHospitalId())
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("behospital_code", analyzeVO.getBehospitalCode())
-                        .in("rec_id", recIds));
-                //新增
-                strInformedConsentServiceImpl.saveBatch(strInformedConsents);
+                if(ListUtil.isNotEmpty(strInformedConsents)){
+                    //删除手术知情同意书历史ric_id
+                    strInformedConsentServiceImpl.remove(new QueryWrapper<StrInformedConsent>()
+                            .eq("hospital_id", analyzeVO.getHospitalId())
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("behospital_code", analyzeVO.getBehospitalCode())
+                            .in("rec_id", recIds));
+                }
+                if(ListUtil.isNotEmpty(strInformedConsents)){
+                    //新增
+                    strInformedConsentServiceImpl.saveBatch(strInformedConsents);
+                }
             }
         }
         // 手动拼接数据【知情同意书】【谈话告知书】
@@ -2566,6 +2574,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         return behospitalInfoAgeDTOList;
     }
+
     /**
      * @param analyzeVO
      * @param codeList

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -682,9 +682,9 @@
     <select id="getMsg" resultType="com.diagbot.dto.MsgDTO">
         SELECT
         a.*, u.linkman,
-        appeal.id appeal_info_id,
+        appeal.id appeal_info_id appealInfoId,
         appeal.appeal_operation_type appealOperationType,
-        appeal.example_status
+        appeal.example_status exampleStatus
         FROM
         (
         SELECT DISTINCT
@@ -742,7 +742,6 @@
         FROM
         med_appeal_info appeal
         JOIN med_appeal_examine_info examine ON examine.appeal_info_id = appeal.id
-        AND examine.example_status = 2
         WHERE
         appeal.is_deleted = 'N'
         ) appeal ON a.id = appeal.qcresult_detail_id