婚姻状况填写错误

联系人关系填写错误

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/changshaxy/firstpagerecord/FIRP03250.java

@@ -6,6 +6,8 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,7 +18,7 @@ import java.util.Map;
  */
 @Component
 public class FIRP03250 extends QCCatalogue {
-    //private List<String>list = Arrays.asList("本人或户主","配偶","子","女","孙子","孙女","外孙子","外孙女","父母","祖父母或外祖父母","兄弟姐妹","同事同学","其他");
+    private List<String> person_list = Arrays.asList("本人或户主","配偶","子","女","孙子","孙女","外孙子","外孙女","父母","祖父母或外祖父母","兄弟姐妹","同事同学","其他");
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() == null) {
             status.set("0");
@@ -30,10 +32,10 @@ public class FIRP03250 extends QCCatalogue {
             if (StringUtil.isNotBlank(name) &&StringUtil.isNotBlank(contactName)){
                 status.set("0");
             }
-            if (relationship.contains("本人或户主") && StringUtil.isNotBlank(relationship) || !relationship.equals("-")){
+            if (person_list.contains(relationship) && StringUtil.isNotBlank(relationship) || !relationship.equals("-")){
                 status.set("-1");
             }
-            if (!relationship.equals(name)){
+            if (contactName.equals(name) || !relationship.equals("本人或户主")){
                 status.set("-1");
             }
         }