1.初步诊断不完整修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0095.java

@@ -1,7 +1,6 @@
 package com.lantone.qc.kernel.catalogue.firstcourserecord;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.RedisUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -9,7 +8,7 @@ import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.entity.Diag;
 import com.lantone.qc.pub.model.label.DiagLabel;
 import com.lantone.qc.pub.util.ListUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -24,14 +23,10 @@ import java.util.List;
  */
 @Component
 public class FIRC0095 extends QCCatalogue {
-    @Autowired
-    private RedisUtil redisUtil;
-
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
-        if (firstCourseRecordDoc == null && beHospitalizedDoc == null) {
+        if (firstCourseRecordDoc == null || beHospitalizedDoc == null) {
             status.set("0");
             return;
         }
@@ -43,16 +38,25 @@ public class FIRC0095 extends QCCatalogue {
             List<String> firstDiags = new ArrayList<>();
             List<String> bhDiags = new ArrayList<>();
             if (diags != null && diags.size() > 0) {
-                for (Diag firdiag : diags) {
-                    firstDiags.add(firdiag.getHospitalDiagName());
-                }
-                for (Diag bhDig : diags1) {
-                    bhDiags.add(bhDig.getHospitalDiagName());
-                }
+                copyDiag(diags, firstDiags);
+                copyDiag(diags1, bhDiags);
                 if (ListUtil.equals(firstDiags, bhDiags)) {
                     status.set("0");
                 }
             }
         }
     }
+
+    private void copyDiag(List<Diag> diags, List<String> diagList) {
+        String hospitalDiagName, name;
+        for (Diag diag : diags) {
+            hospitalDiagName = diag.getHospitalDiagName();
+            name = diag.getName();
+            if (StringUtil.isNotBlank(hospitalDiagName)) {
+                diagList.add(hospitalDiagName);
+            } else if (StringUtil.isNotBlank(name)) {
+                diagList.add(name);
+            }
+        }
+    }
 }