Merge remote-tracking branch 'origin/shaoyf/dev' into shaoyf/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03069.java

@@ -168,7 +168,10 @@ public class THR03069 extends QCCatalogue {
         } catch (Exception e) {
             System.out.println("THR03069:       " + drugName + ":" + value + "解析异常");
         }
-        if (!antibioticValue.containsKey(drugName) && v > 0) {
+        if (v < 0) {
+            return;
+        }
+        if (!antibioticValue.containsKey(drugName)) {
             antibioticValue.put(drugName, v);
             antibioticDate.put(drugName, Lists.newArrayList(startDateStr));
             antibioticStatus.put(drugName, 0);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03072.java

@@ -168,7 +168,10 @@ public class THR03072 extends QCCatalogue {
         } catch (Exception e) {
             System.out.println("THR03072:       " + drugName + ":" + value + "解析异常");
         }
-        if (!antibioticValue.containsKey(drugName) && v > 0) {
+        if (v < 0) {
+            return;
+        }
+        if (!antibioticValue.containsKey(drugName)) {
             antibioticValue.put(drugName, v);
             antibioticDate.put(drugName, Lists.newArrayList(startDateStr));
             antibioticStatus.put(drugName, 0);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03074.java

@@ -164,7 +164,10 @@ public class THR03074 extends QCCatalogue {
         } catch (Exception e) {
             System.out.println("THR03074:       " + drugName + ":" + value + "解析异常");
         }
-        if (!antibioticValue.containsKey(drugName) && v > 0) {
+        if (v < 0) {
+            return;
+        }
+        if (!antibioticValue.containsKey(drugName)) {
             antibioticValue.put(drugName, v);
             antibioticDate.put(drugName, Lists.newArrayList(startDateStr));
             antibioticStatus.put(drugName, 0);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03075.java

@@ -156,7 +156,10 @@ public class THR03075 extends QCCatalogue {
         } catch (Exception e) {
             System.out.println("THR03075:       " + drugName + ":" + value + "解析异常");
         }
-        if (!antibioticValue.containsKey(drugName) && v > 0) {
+        if (v < 0) {
+            return;
+        }
+        if (!antibioticValue.containsKey(drugName)) {
             antibioticValue.put(drugName, v);
             antibioticDate.put(drugName, Lists.newArrayList(startDateStr));
             antibioticStatus.put(drugName, 0);