Merge remote-tracking branch 'origin/20211018_yw_check' into 20211018_yw_check

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

@@ -243,8 +243,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该病历已删除!");
             }
             BeanUtil.copyProperties(behospitalInfo, behosDTO);
-            if(null != homePage && StringUtils.isNotEmpty(homePage.getAge()) && StringUtils.isNotEmpty(homePage.getAgeUnit())){
-                behosDTO.setAge(homePage.getAge()+homePage.getAgeUnit());
+            if (null != homePage && StringUtils.isNotEmpty(homePage.getAge()) && StringUtils.isNotEmpty(homePage.getAgeUnit())) {
+                behosDTO.setAge(homePage.getAge() + homePage.getAgeUnit());
             }
             res.put("beHospital", behosDTO);
         }
@@ -360,7 +360,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     .eq("hospital_id", analyzeVO.getHospitalId())
                     .eq("behospital_code", analyzeVO.getBehospitalCode())
                     .eq("is_deleted", IsDeleteEnum.N.getKey()));
-            if (qcresultInfo != null && qcresultInfo.getId() != null){
+            if (qcresultInfo != null && qcresultInfo.getId() != null) {
                 analyzeVO.setQcresultInfoId(qcresultInfo.getId());
             }
             List<MsgDTO> msgDTOList = getMsg(analyzeVO);
@@ -2115,7 +2115,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         exportQcresultVOSet(exportQcresultVO);
         List<ExportExcelByDeptDTO> records = this.exportQcresultByDept(exportQcresultVO);
         List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
-        if(ListUtil.isNotEmpty(records)){
+        if (ListUtil.isNotEmpty(records)) {
             ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
             exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
             exportByDeptDTO.setWardName(records.get(0).getWardName());
@@ -2123,7 +2123,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             resDTO.add(exportByDeptDTO);
         }
         List<ExportNinetyByDeptDTO> resWide = new ArrayList<ExportNinetyByDeptDTO>();
-        if("2".equals(exportQcresultVO.getRadioCheck())){
+        if ("2".equals(exportQcresultVO.getRadioCheck())) {
             resWide = ConsoleByDeptExportFacade.transList(records, resWide);
         }
         String fileName = "抽查住院病历质量情况.xls";
@@ -2300,8 +2300,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<QcResultAlgVO> qcResultAlgVOList = new ArrayList<>();
         //获取本用户原手动添加的扣分条目(删除|未删除)
         List<QcCasesEntry> qcCasesEntryHistory = new ArrayList<>();
-        List<QcresultDetail> qcresultDetails = getQcDetailHistory(analyzeVO, codeList,qcCasesEntryHistory);
-        Map<Long,List<QcCasesEntry>> qcCasesEntryHistoryMap = qcCasesEntryHistory.stream().collect(Collectors.groupingBy(QcCasesEntry::getId));
+        List<QcresultDetail> qcresultDetails = getQcDetailHistory(analyzeVO, codeList, qcCasesEntryHistory);
+        Map<Long, List<QcCasesEntry>> qcCasesEntryHistoryMap = qcCasesEntryHistory.stream().collect(Collectors.groupingBy(QcCasesEntry::getId));
         if (ListUtil.isNotEmpty(codeList)) {
             // 根据质控结果获取质控条目
             QcResultAlgQueryVO qcResultAlgQueryVO = new QcResultAlgQueryVO();
@@ -2319,22 +2319,24 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             }
         }
         //1.1未删除的手工评分
-        List<QcresultDetail> notDelQcDetailHistory = qcresultDetails.stream()
-                .filter(qcresultDetail -> "N".equals(qcresultDetail.getIsDeleted())).collect(Collectors.toList());
         List<QcResultAlgVO> rgQcResultAlgVOList = new ArrayList<>();
-        if(ListUtil.isNotEmpty(notDelQcDetailHistory)){
-            notDelQcDetailHistory.stream().forEach(qcresultDetail -> {
-                QcResultAlgVO temp = new QcResultAlgVO();
-                BeanUtils.copyProperties(qcresultDetail,temp);
-                try{
-                    temp.setCode(qcCasesEntryHistoryMap.get(qcresultDetail.getCasesEntryId()).get(0).getCode());
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-                rgQcResultAlgVOList.add(temp);
-            });
+        if (qcresultDetails != null) {
+            List<QcresultDetail> notDelQcDetailHistory = qcresultDetails.stream()
+                    .filter(qcresultDetail -> "N".equals(qcresultDetail.getIsDeleted())).collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(notDelQcDetailHistory)) {
+                notDelQcDetailHistory.stream().forEach(qcresultDetail -> {
+                    QcResultAlgVO temp = new QcResultAlgVO();
+                    BeanUtils.copyProperties(qcresultDetail, temp);
+                    try {
+                        temp.setCode(qcCasesEntryHistoryMap.get(qcresultDetail.getCasesEntryId()).get(0).getCode());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    rgQcResultAlgVOList.add(temp);
+                });
+            }
+            qcResultAlgVOList.addAll(rgQcResultAlgVOList);
         }
-        qcResultAlgVOList.addAll(rgQcResultAlgVOList);
 
         // 评分
         AlgorithmVO algorithmVO = new AlgorithmVO();
@@ -2349,38 +2351,38 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         //保存
         Map<String, Object> pageMap = outputInfo.getPageData();
         //保存解析过后的手术知情同意书
-            List<String> recIds = new ArrayList<>();
-            if(pageMap.containsKey("手术知情同意书")){
-                Object informObject = pageMap.get("手术知情同意书");
-                List<Map<String,Object>> informList= (List<Map<String,Object>>) informObject;
-                List<StrInformedConsent> strInformedConsents = new ArrayList<>();
-                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("记录编号")));
-                            }
-                    );
-                    //删除手术知情同意书历史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);
-                }
+        List<String> recIds = new ArrayList<>();
+        if (pageMap.containsKey("手术知情同意书")) {
+            Object informObject = pageMap.get("手术知情同意书");
+            List<Map<String, Object>> informList = (List<Map<String, Object>>) informObject;
+            List<StrInformedConsent> strInformedConsents = new ArrayList<>();
+            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("记录编号")));
+                        }
+                );
+                //删除手术知情同意书历史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);
             }
+        }
         // 手动拼接数据【知情同意书】【谈话告知书】
         List<MedicalRecord> recordList = medicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -2433,7 +2435,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @Description获取原手动扣分分值条目
      * @Return void
      */
-    private List<QcresultDetail> getQcDetailHistory(AnalyzeVO analyzeVO, List<String> codeList,List<QcCasesEntry> qcCasesEntryHistory) {
+    private List<QcresultDetail> getQcDetailHistory(AnalyzeVO analyzeVO, List<String> codeList, List<QcCasesEntry> qcCasesEntryHistory) {
         List<QcresultDetail> qcresultDetails = null;
         try {
             QcresultInfo qcresultInfoup
@@ -2443,7 +2445,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                             .eq("hospital_id", analyzeVO.getHospitalId())
                             .eq("behospital_code", analyzeVO.getBehospitalCode()), false);
             //未评过分
-            if(qcresultInfoup==null){
+            if (qcresultInfoup == null) {
                 return null;
             }
             //1.获取上一次评分手工添加的条目