bug

doc/031.20210326v2.0.2/qc_initv2.0.2.sql

@@ -290,7 +290,6 @@ CREATE TABLE `med_index_result` (
   `file_complete_result` double(5,0) DEFAULT NULL COMMENT '出院患者病历归档完整率-分母',
   `no_copy_result` double(5,0) DEFAULT NULL COMMENT '不合理复制病历发生率-分母',
   `record_sign_result` double(5,0) DEFAULT NULL COMMENT '知情同意书规范签署率-分母',
-  `fir_record_result` double(5,0) DEFAULT NULL COMMENT '甲级病历率-分母',
   `start_date` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP,
   `end_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   `is_deleted` char(3) DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',

src/main/java/com/diagbot/enums/TimeContent.java

@@ -30,10 +30,6 @@ public class TimeContent {
             "2021-11-06", "2021-11-07", "2021-11-13", "2021-11-14", "2021-11-20", "2021-11-21", "2021-11-27", "2021-11-28",//十一月周末假日
             "2021-12-04", "2021-12-06", "2021-12-11", "2021-12-12", "2021-12-18", "2021-12-19", "2021-12-25", "2021-12-26" //十二周末假日
     );
-
-    public static List<String> getHolidaysTimeList() {
-        return HolidaysTimeList;
-    }
 }
 
 

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

@@ -2848,8 +2848,8 @@ public class ConsoleFacade {
         DecimalFormat df = new DecimalFormat("#0.00");
         double count = medManageParams.get("sec_file_result");
         String num = null;
-        if(StringUtils.isNotEmpty( baseIndex.get("firWorkNum").toString()) && ! baseIndex.get("firWorkNum").toString().equals("0") ){
-            double retNum =count* 100/Double.parseDouble(baseIndex.get("firWorkNum").toString());
+        if(StringUtils.isNotEmpty( baseIndex.get("sevenWorkNum").toString()) && ! baseIndex.get("sevenWorkNum").toString().equals("0") ){
+            double retNum =count* 100/Double.parseDouble(baseIndex.get("sevenWorkNum").toString());
             double firGradeStr = Double.parseDouble(df.format(retNum));
             num = String.valueOf(firGradeStr);
         }
@@ -2883,7 +2883,7 @@ public class ConsoleFacade {
             //指标一
             String num1 = "0";
             if(secMouth != 0d && secMouth != null && StringUtils.isNotEmpty( baseIndex.get("firWorkNum").toString())){
-                num1 = String.valueOf(Math.ceil(Double.parseDouble(baseIndex.get("firWorkNum").toString()) / secMouth));
+                num1 = String.valueOf(Math.round(Double.parseDouble(baseIndex.get("firWorkNum").toString()) / secMouth));
             }
             LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
             firMap.put("name","住院病案管理人员月均负担出院患者病历数");
@@ -2901,7 +2901,7 @@ public class ConsoleFacade {
             String num3 = "0";
             if(firMouth != 0d && firMouth != null  && StringUtils.isNotEmpty( baseIndex.get("secWorkNum").toString())){
                 //指标二
-                num3 = String.valueOf(Math.ceil(Double.parseDouble(baseIndex.get("secWorkNum").toString())/firMouth));
+                num3 = String.valueOf(Math.round(Double.parseDouble(baseIndex.get("secWorkNum").toString())/firMouth));
             }
             LinkedHashMap<String, String> thrMap = new LinkedHashMap<>();
             thrMap.put("name","门诊病案管理人员月均负担门诊患者病历数");
@@ -2920,7 +2920,7 @@ public class ConsoleFacade {
             //指标三
             String num2 = "0";
             if(thrMouth != 0d && thrMouth != null && StringUtils.isNotEmpty( baseIndex.get("firWorkNum").toString())){
-                num2 = String.valueOf(Math.ceil(Double.parseDouble(baseIndex.get("firWorkNum").toString())/thrMouth));
+                num2 = String.valueOf(Math.round(Double.parseDouble(baseIndex.get("firWorkNum").toString())/thrMouth));
 
             }
             LinkedHashMap<String, String> secMap = new LinkedHashMap<>();
@@ -3029,7 +3029,7 @@ public class ConsoleFacade {
         Iterator<BehospitalInfo> iterator = list.iterator();
         while (iterator.hasNext()){
             BehospitalInfo beh = iterator.next();
-            Boolean flag = getTrueSecFile(beh.getLeaveHospitalDate(), beh.getPlacefileDate(), TimeContent.getHolidaysTimeList());
+            Boolean flag = getTrueSecFile(beh.getLeaveHospitalDate(), beh.getPlacefileDate(), TimeContent.HolidaysTimeList);
             //时间截止则删除元素
             if(!flag){
                 iterator.remove();

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -721,7 +721,8 @@
         f2.secWorkNum,
         f3.thrWorkNum,
         f3.forWorkNum,
-        f3.sixWorkNum
+        f3.sixWorkNum,
+        f4.sevenWorkNum
         from (
         SELECT  count(*)  as firWorkNum
         FROM
@@ -772,7 +773,23 @@
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>)m
-            )f3
+            )f3,(
+        SELECT  count(*)  as sevenWorkNum
+        FROM
+        med_behospital_info a
+        WHERE
+        a.is_deleted = 'N'
+        AND a.is_placefile = 1
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
+        <![CDATA[AND a.qc_type_id <>0 ]]>
+        <if test="startDate != null and startDate != ''">
+            <![CDATA[ AND a.leave_hospital_date >= #{startDate}]]>
+        </if>
+        <if test="endDate != null and endDate != ''">
+            <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
+        </if>)f4
     </select>
 
     <!-- 病案管理规则质控缺陷病历总数查询-->