|
@@ -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)) {
|