|
@@ -184,6 +184,7 @@ public class THR03076 extends QCCatalogue {
|
|
Date adDate = StringUtil.parseDateTime(adDateStr);
|
|
Date adDate = StringUtil.parseDateTime(adDateStr);
|
|
List<Double> adUsage = adMap.getValue();
|
|
List<Double> adUsage = adMap.getValue();
|
|
for (Map.Entry<String, List<Double>> wdvMap : wardDateValue.entrySet()) {
|
|
for (Map.Entry<String, List<Double>> wdvMap : wardDateValue.entrySet()) {
|
|
|
|
+ StringBuffer innersb = new StringBuffer();
|
|
String wardDateStr = wdvMap.getKey();
|
|
String wardDateStr = wdvMap.getKey();
|
|
Date wardDate = StringUtil.parseDateTime(wardDateStr);
|
|
Date wardDate = StringUtil.parseDateTime(wardDateStr);
|
|
List<Double> wardUsage = wdvMap.getValue();
|
|
List<Double> wardUsage = wdvMap.getValue();
|
|
@@ -192,14 +193,14 @@ public class THR03076 extends QCCatalogue {
|
|
DateUtils.isSameDay(wardDate, adDate)) {
|
|
DateUtils.isSameDay(wardDate, adDate)) {
|
|
wardUsage.removeAll(adUsage);//比如adUsage有1.0、2.0,wardUsage中有2.0、3.0,removeAll之后wardUsage只剩3.0
|
|
wardUsage.removeAll(adUsage);//比如adUsage有1.0、2.0,wardUsage中有2.0、3.0,removeAll之后wardUsage只剩3.0
|
|
adDateStr = DateUtil.formatDateTime(adDate);
|
|
adDateStr = DateUtil.formatDateTime(adDate);
|
|
- if (wardUsage.size() > 0 && !sb.toString().contains(drugKey + "(" + adDateStr + ")")) {
|
|
|
|
- infoAppend(sb, ai.getKey(), adDateStr);
|
|
|
|
|
|
+ if (wardUsage.size() > 0 && !sb.toString().contains(ai.getKey() + "(" + adDateStr + ")")) {
|
|
|
|
+ infoAppend(innersb, ai.getKey(), adDateStr);
|
|
}
|
|
}
|
|
if(wardUsage.size() == 0){
|
|
if(wardUsage.size() == 0){
|
|
- sb = new StringBuffer();
|
|
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ sb.append(innersb);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|