فهرست منبع

info提示信息时间格式改为年月日时分秒

wangsy 4 سال پیش
والد
کامیت
6ccf7d877a

+ 5 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02985.java

@@ -72,7 +72,8 @@ public class THR02985 extends QCCatalogue {
             String drugName = adviceDoc.get("医嘱项目名称");
             String startDateStr = adviceDoc.get("医嘱开始时间");
             if (StringUtil.isNotBlank(drugName)) {
-                startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+//                startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+                startDate = StringUtil.parseDateTime(startDateStr);
                 if (antibioticDateTimes.get(drugName).get(startDate) > 0) {
                     continue;   //一天内同一抗生素开过多次的抗生素直接过滤
                 }
@@ -210,7 +211,7 @@ public class THR02985 extends QCCatalogue {
                 }
             }
             if (StringUtil.isNotBlank(missDrug) && !modelFind && CatalogueUtil.compareTime(doctorAdviceDate, new Date(), 48 * 60L)) {
-                infoAppend(sb, drugs, DateUtil.formatDate(doctorAdviceDate));
+                infoAppend(sb, drugs, DateUtil.formatDateTime(doctorAdviceDate));
                 data.put(doctorAdviceDate, splitDrugs.toString().replaceAll("[\\[\\]]", ""));
             }
         }
@@ -235,7 +236,8 @@ public class THR02985 extends QCCatalogue {
         for (Map<String, String> structMap : docAdvStruct) {
             drugName = structMap.get("医嘱项目名称");
             startDateStr = structMap.get("医嘱开始时间");
-            startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+//            startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+            startDate = StringUtil.parseDateTime(startDateStr);
             if (antibioticDateTimes.containsKey(drugName)) {
                 Map<Date, Integer> map = antibioticDateTimes.get(drugName);
                 if (map.containsKey(startDate)) {

+ 5 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02986.java

@@ -75,7 +75,8 @@ public class THR02986 extends QCCatalogue {
                 if (Arrays.asList(JS).contains(drugName)) {
                     continue;
                 }
-                startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+//                startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+                startDate = StringUtil.parseDateTime(startDateStr);
                 if (antibioticDateTimes.get(drugName).get(startDate) > 0) {
                     continue;   //一天内同一激素开过多次的激素直接过滤
                 }
@@ -207,7 +208,7 @@ public class THR02986 extends QCCatalogue {
             }
 
             if (StringUtil.isNotBlank(missDrug) && !modelFind && CatalogueUtil.compareTime(doctorAdviceDate, new Date(), 48 * 60L)) {
-                infoAppend(sb, splitDrugs.toString().replaceAll("[\\[\\]]", ""), DateUtil.formatDate(doctorAdviceDate));
+                infoAppend(sb, splitDrugs.toString().replaceAll("[\\[\\]]", ""), DateUtil.formatDateTime(doctorAdviceDate));
                 data.put(doctorAdviceDate, splitDrugs.toString().replaceAll("[\\[\\]]", ""));
             }
         }
@@ -232,7 +233,8 @@ public class THR02986 extends QCCatalogue {
         for (Map<String, String> structMap : docAdvStruct) {
             drugName = structMap.get("医嘱项目名称");
             startDateStr = structMap.get("医嘱开始时间");
-            startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+//            startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+            startDate = StringUtil.parseDateTime(startDateStr);
             if (antibioticDateTimes.containsKey(drugName)) {
                 Map<Date, Integer> map = antibioticDateTimes.get(drugName);
                 if (map.containsKey(startDate)) {

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03070.java

@@ -193,7 +193,7 @@ public class THR03070 extends QCCatalogue {
     private void infoAppend(StringBuffer sb, String repNm, Map<String, String> abnormalMap) {
         for (Map.Entry<String, String> map : abnormalMap.entrySet()) {
             if (repNm.equals(map.getKey())) {
-                sb.append(repNm).append("(").append(DateUtil.formatDate(StringUtil.parseDateTime(map.getValue()))).append(")").append("、");
+                sb.append(repNm).append("(").append(DateUtil.formatDateTime(StringUtil.parseDateTime(map.getValue()))).append(")").append("、");
             }
         }
     }

+ 1 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03071.java

@@ -128,14 +128,12 @@ public class THR03071 extends QCCatalogue {
      * @param pacsDate
      */
     private void infoAppend(StringBuffer sb, String reptNm, Map<String, List<String>> pacsDate) {
-
         for (Map.Entry<String, List<String>> map : pacsDate.entrySet()) {
             if (reptNm.equals(map.getKey())) {
                 for (String date : map.getValue()) {
-                    sb.append(reptNm).append("(").append(DateUtil.formatDate(StringUtil.parseDateTime(date))).append(")").append("、");
+                    sb.append(reptNm).append("(").append(DateUtil.formatDateTime(StringUtil.parseDateTime(date))).append(")").append("、");
                 }
             }
         }
     }
-
 }