Merge branch 'dev/20210326_2.0.2' into test

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

@@ -284,8 +284,7 @@ CREATE TABLE `med_index_result` (
   `operation_complete_result` double(5,0) DEFAULT NULL COMMENT '手术相关记录完成率-分母',
   `implants_result` double(5,0) DEFAULT NULL COMMENT '植入物相关记录符合率-分母',
   `blood_result` double(5,0) DEFAULT NULL COMMENT '临床用血相关记录符合率-分母',
-  `
-ward_round_result` double(5,0) DEFAULT NULL COMMENT '医师查房记录完整率-分母',
+  `ward_round_result` double(5,0) DEFAULT NULL COMMENT '医师查房记录完整率-分母',
   `rescue_result` double(5,0) DEFAULT NULL COMMENT '患者抢救记录及时完成率-分母',
   `sec_file_result` double(5,0) DEFAULT NULL COMMENT '出院患者病历2日归档率-分子',
   `file_complete_result` double(5,0) DEFAULT NULL COMMENT '出院患者病历归档完整率-分母',

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

@@ -92,7 +92,7 @@ public class QualityContent {
      * 医嘱CT相关
      */
     public static String[][] CT_LIST = {{"CT"},{"X线"}};
-    public static String[][] CT_REGULATION = {{"ATCH","TCT","HCT","OCT","NCT","LCT","ACT"},{"取消"},{"暂停"}};
+    public static String[][] CT_REGULATION = {{"ATCH"},{"TCT"},{"HCT"},{"OCT"},{"NCT"},{"LCT"},{"ACT"},{"取消"},{"暂停"}};
 
     /**
      * 医嘱手术相关

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

@@ -2944,7 +2944,7 @@ public class ConsoleFacade {
             if( firRecord != 0d && StringUtils.isNotEmpty( baseIndex.get("sixWorkNum").toString()) ){
                 double retNum = Double.parseDouble(baseIndex.get("sixWorkNum").toString()) * 100 / firRecord;
                 double firGradeStr = Double.parseDouble(df.format(retNum));
-                num4 = String.valueOf(Math.ceil(firGradeStr));
+                num4 = String.valueOf(firGradeStr);
             }
             LinkedHashMap<String, String> fouMap = new LinkedHashMap<>();
             fouMap.put("name","甲级病历率");
@@ -3043,6 +3043,9 @@ public class ConsoleFacade {
     }
 
     private Boolean getTrueSecFile(Date date1,Date date2, List<String> holidaysTimeList){
+        if(date1.after(date2)){
+            return false;
+        }
         Date date = date1;
         Date dateSec = date2;
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -3077,19 +3080,6 @@ public class ConsoleFacade {
         return false;
     }
 
-    private void firMethods(String indexName, Map<String, Object> baseIndex, MedIndexResult medIndexResult){
-        DecimalFormat df = new DecimalFormat("0.00");
-        //指标二十七 -甲级病历率
-        Double firRecord = 0d;
-        if(StringUtils.isNotEmpty( baseIndex.get("forWorkNum").toString())){
-            firRecord =Double.parseDouble(baseIndex.get("forWorkNum").toString());
-        }
-        if( firRecord != 0d && StringUtils.isNotEmpty( baseIndex.get("sixWorkNum").toString()) ){
-            double retNum = Double.parseDouble(baseIndex.get("sixWorkNum").toString()) * 100 / firRecord;
-            double firGradeStr = Double.parseDouble(df.format(retNum));
-            medIndexResult.setFirRecordResult(firGradeStr);
-        }
-    };
 
     private void timeTrans( MedIndexFilterVO  filterVO){
         SimpleDateFormat myFormatter = new SimpleDateFormat("yyyy-MM-dd");