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

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

@@ -29,7 +29,7 @@ public class BEH0415 extends QCCatalogue {
             String contactAddress_bh = structureMap.get("民族");
             String contactAddress_first = firstStructMap.get(Content.nation);
             if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
-                if (!contactAddress_first.equals(contactAddress_bh)) {
+                if (!contactAddress_first.equals(contactAddress_bh)&&!contactAddress_bh.contains(contactAddress_first)&&!contactAddress_first.contains(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -8,6 +8,8 @@ import com.lantone.qc.pub.model.label.TreatPlanLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @ClassName : FIRC0092
  * @Description : 治疗措施不具体
@@ -31,6 +33,12 @@ public class FIRC0092 extends QCCatalogue {
         if (StringUtil.isNotBlank(text) && text.contains("护理")) {
             findText = true;
         }
+
+        Map<String,String> structureMap = firstCourseRecordDoc.getStructureMap();
+        String structureV= structureMap.get("治疗监测计划");
+        if(StringUtil.isNotBlank(structureV) && structureV.contains("护理")){
+            findText = true;
+        }
         if ((treatPlanLabel.getNursingLevel() != null || findText) &&
                 (treatPlanLabel.getMedicine() != null || treatPlanLabel.getTreat().size() > 0
                         || treatPlanLabel.getPacs().size() > 0)) {

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

@@ -241,6 +241,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
             "新会诊-会诊地点=会诊地点",
             "新会诊-接待医生=会诊医师",
             "新会诊-会诊意见=会诊意见",
+            "新会诊-会诊科室=会诊科室",
             "签名++++=签名",
             "++++会诊医师=会诊医师"
     );