Merge branch 'dev/20200716_1.3.8' into debug

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

@@ -183,6 +183,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
             mapAll.put("behospital_code", getDetailVO.getBehospitalCode());
             mapAll.put("hospital_id", hospitalId);
+            mapAll.put("check_type", 0);
             QueryWrapper<MedCheckInfo> medCheckInfoQuerys = new QueryWrapper<>();
             medCheckInfoQuerys.allEq(mapAll);
             int count = medCheckInfoFacade.count(medCheckInfoQuerys);
@@ -191,6 +192,20 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             } else {
                 res.put("checkStatus", 0);
             }
+            //增加该病案首页是否核查状态
+            Map<String, Object> mapAllMr = new HashMap<String, Object>();
+            mapAllMr.put("is_deleted", IsDeleteEnum.N.getKey());
+            mapAllMr.put("behospital_code", getDetailVO.getBehospitalCode());
+            mapAllMr.put("hospital_id", hospitalId);
+            mapAllMr.put("check_type", 1);
+            QueryWrapper<MedCheckInfo> medCheckInfoMr = new QueryWrapper<>();
+            medCheckInfoQuerys.allEq(mapAll);
+            int countMr = medCheckInfoFacade.count(medCheckInfoMr);
+            if (countMr > 0) {
+                res.put("mrStatus", 1);
+            } else {
+                res.put("mrStatus", 0);
+            }
         }
 
         // 获取提示信息