Merge remote-tracking branch 'origin/debug' into debug

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

@@ -27,7 +27,8 @@ public class BEH0441 extends QCCatalogue {
         List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
         if(ListUtil.isNotEmpty(generals)){
             for (GeneralDesc general:generals) {
-                if(general.getName().contains("纳")|| general.getName().contains("饮食") || general.getName().contains("进食")){
+                if(general.getName().contains("纳")|| general.getName().contains("饮食")
+                        || general.getName().contains("进食")|| general.getName().contains("食欲")){
                     status.set("0");
                     break;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0275.java

@@ -6,9 +6,12 @@ import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @ClassName : FIRP0275
@@ -26,9 +29,22 @@ public class FIRP0275 extends QCCatalogue {
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
             String firstDischargeTime = firstpageStructureMap.get(Content.actualStay);//病案首页出院时间
             String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength);//出院小结出院时间
-            if (!CatalogueUtil.compareToken(firstDischargeTime, dischargeTime)) {
+            String first = copileNum(firstDischargeTime);
+            String disc = copileNum(dischargeTime);
+            if (!first.equals(disc)) {
                 status.set("-1");
             }
         }
     }
+
+    private String copileNum(String firstDischargeTime) {
+        String num= "";
+        String compile = "([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])";
+        Pattern compile1 = Pattern.compile(compile);
+        Matcher matcher = compile1.matcher(firstDischargeTime);
+        while (matcher.find()){
+            num = matcher.group(0);
+        }
+        return num;
+    }
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouConsultationDocTrans.java

@@ -135,7 +135,7 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
 
     // 会诊结果映射字段
     private List<String> consultationResults_keyContrasts = Lists.newArrayList(
-
+        "事件日期1(会诊申请日期)=会诊申请日期"
     );