Merge branch 'dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0398.java

@@ -35,10 +35,12 @@ public class BEH0398 extends QCCatalogue {
         FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
         if (familyLabel != null) {
             String familyLabelText = familyLabel.getText();
-            if (familyLabelText.contains("独生子") || familyLabelText.contains("独生女")
-                    || familyLabelText.contains("独子") || familyLabelText.contains("独女")) {
-                status.set("0");
-                return;
+            if(StringUtil.isNotBlank(familyLabelText)){
+                if (familyLabelText.contains("独生子") || familyLabelText.contains("独生女")
+                        || familyLabelText.contains("独子") || familyLabelText.contains("独女")) {
+                    status.set("0");
+                    return;
+                }
             }
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
@@ -46,6 +48,10 @@ public class BEH0398 extends QCCatalogue {
             status.set("0");
             return;
         }
+        if(StringUtils.isNotEmpty("兄弟姐妹健康状况")){
+            status.set("0");
+            return;
+        }
         List<Family> familyList = Lists.newArrayList();
         List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
         List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -111,7 +111,8 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "++++过敏史=过敏史",
             "++++输血史=输血史",
             "++++胸闷心悸史=胸闷心悸史",
-            "签名++++=医师签名"
+            "签名++++=医师签名",
+            "兄弟姐妹健康状况++++兄弟姐妹=兄弟姐妹健康状况"
     );
 
     private String concatString(String item) {