浏览代码

提示按时间排序,info医嘱删除

wangsy 4 年之前
父节点
当前提交
2320cef560
共有 1 个文件被更改,包括 20 次插入16 次删除
  1. 20 16
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03077.java

+ 20 - 16
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03077.java

@@ -215,31 +215,34 @@ public class THR03077 extends QCCatalogue {
             }
             if (antibioticDateCourse.containsKey(drugKey)) {
                 for (Map.Entry<String, List<String>> adc : antibioticDateCourse.entrySet()) {
-                    List<String> dateMissInfos = adc.getValue();
-                    for (String dateMissInfo : dateMissInfos) {
-                        StringBuffer sb = new StringBuffer();
-                        date_missInfo = dateMissInfo.split("=");
-                        source = date_missInfo[2];
-                        sb.append(source).append("=").append(date_missInfo[0]).append("=").append(date_missInfo[1]);
+                    if (adc.getKey().equals(drugKey)) {
+                        List<String> dateMissInfos = adc.getValue();
+                        for (String dateMissInfo : dateMissInfos) {
+                            StringBuffer sb = new StringBuffer();
+                            date_missInfo = dateMissInfo.split("=");
+                            source = date_missInfo[2];
+                            sb.append(source).append("=").append(date_missInfo[0]).append("=").append(date_missInfo[1]);
 
-                        if (date_missInfo.length > 0) {
-                            if (sourceDateMap.containsKey(source)) {
-                                Map<String, List<String>> drugData = sourceDateMap.get(source);
-                                if (drugData.containsKey(drugKey)) {
-                                    drugData.get(drugKey).add(sb.toString());
+                            if (date_missInfo.length > 0) {
+                                if (sourceDateMap.containsKey(source)) {
+                                    Map<String, List<String>> drugData = sourceDateMap.get(source);
+                                    if (drugData.containsKey(drugKey)) {
+                                        drugData.get(drugKey).add(sb.toString());
+                                    } else {
+                                        drugData.put(drugKey, Lists.newArrayList(sb.toString()));
+                                    }
                                 } else {
+                                    Map<String, List<String>> drugData = Maps.newHashMap();
                                     drugData.put(drugKey, Lists.newArrayList(sb.toString()));
+                                    sourceDateMap.put(source, drugData);
                                 }
-                            } else {
-                                Map<String, List<String>> drugData = Maps.newHashMap();
-                                drugData.put(drugKey, Lists.newArrayList(sb.toString()));
-                                sourceDateMap.put(source, drugData);
                             }
                         }
                     }
                 }
             }
         }
+
         //表示提示信息
         if (sourceDateMap.size() > 0) {
             infoDisplay(sourceDateMap, source, drugKey);
@@ -255,6 +258,7 @@ public class THR03077 extends QCCatalogue {
     private void infoDisplay(Map<String, Map<String, List<String>>> sourceDateMap, String source, String drugKey) {
         StringBuffer strBuf = new StringBuffer();
         List<String> dateList = null;
+
         for (Map.Entry<String, Map<String, List<String>>> ad : sourceDateMap.entrySet()) {
             source = ad.getKey();
             Map<String, List<String>> drugInfo = ad.getValue();
@@ -276,7 +280,7 @@ public class THR03077 extends QCCatalogue {
 
         if (strBuf.toString().length() > 0) {
             status.set("-1");
-            info.set("(医嘱:" + strBuf.toString().substring(0, strBuf.toString().length() - 1) + ")");
+            info.set(strBuf.toString().substring(0, strBuf.toString().length() - 1));
         }
     }