|
@@ -133,7 +133,8 @@ public class THR03076 extends QCCatalogue {
|
|
|
List<Double> wardUsage = wdvMap.getValue();
|
|
|
if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(adDate), StringUtil.parseDateTime(wardDate), 48 * 60L)) {
|
|
|
wardUsage.removeAll(adUsage);//比如adUsage有1.0、2.0,wardUsage中有2.0、3.0,removeAll之后wardUsage只剩3.0
|
|
|
- if (wardUsage.size() > 0 && !sb.toString().contains(drugKey)) {
|
|
|
+ adDate = DateUtil.formatDate(StringUtil.parseDateTime(adDate));
|
|
|
+ if (wardUsage.size() > 0 && !sb.toString().contains(adDate)) {
|
|
|
infoAppend(sb, drugKey, adDate);
|
|
|
break;
|
|
|
}
|
|
@@ -172,7 +173,7 @@ public class THR03076 extends QCCatalogue {
|
|
|
* @param date
|
|
|
*/
|
|
|
private void infoAppend(StringBuffer sb, String drugKey, String date) {
|
|
|
- sb.append(drugKey).append("(").append(DateUtil.formatDate(StringUtil.parseDateTime(date))).append(")").append(",");
|
|
|
+ sb.append(drugKey).append("(").append(date).append(")").append(",");
|
|
|
}
|
|
|
|
|
|
/**
|