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

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

@@ -58,6 +58,9 @@ public class THR02985 extends QCCatalogue {
                 if (drug.equals("合资") || drug.equals("进口") || drug.equals("国产") ) {
                     continue;
                 }
+                if (drug.contains("注射用")) {
+                    drug = drug.substring(drug.indexOf("注射用") + 3);
+                }
                 matchSum = getMatchSum(allDoctorWradDocs, doctorAdviceDate, drug, matchSum, 2);
                 if (matchSum > 0) {
                     isFind = true;

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

@@ -51,6 +51,9 @@ public class THR02986 extends QCCatalogue {
         for (Map.Entry<Date, String> doctorAdviceDrug : doctorAdviceDrugMap.entrySet()) {
             Date doctorAdviceDate = doctorAdviceDrug.getKey();
             String drug = doctorAdviceDrug.getValue();
+            if (drug.contains("注射用")) {
+                drug = drug.substring(drug.indexOf("注射用") + 3);
+            }
             int matchSum = 0;
             matchSum = getMatchSum(allDoctorWradDocs, doctorAdviceDate, drug, matchSum, 2);
             if (matchSum == 0) {