Merge remote-tracking branch 'origin/master'

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

@@ -38,6 +38,8 @@ public class BEH0012 extends QCCatalogue {
             }
             if(diags_out.size()>0){
                 info.set(diags_out.toString().replace("[","").replace("]",""));
+            }else {
+                status.set("0");
             }
         }else {
             status.set("0");

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

@@ -11,7 +11,7 @@ import java.util.Map;
 
 /**
  * @ClassName : FIRP0225
- * @Description : 出院时间与出院记录时间不一致
+ * @Description : 出院时间与出院记录时间不一致,具体到天
  * @Author : 胡敬
  * @Date: 2020-03-14 17:10
  */
@@ -25,7 +25,7 @@ public class FIRP0225 extends QCCatalogue {
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
             String firstDischargeTime = firstpageStructureMap.get(Content.dischargeTime);//病案首页出院时间
             String dischargeTime = leaveHospitalStructureMap.get(Content.dischargeTime);//出院小结出院时间
-            if (!CatalogueUtil.equalsDate(firstDischargeTime, dischargeTime, "yyyy-MM-ddHH:mm")) {
+            if (!CatalogueUtil.equalsDate(firstDischargeTime, dischargeTime, "yyyy-MM-dd")) {
                 status.set("-1");
             }
         }

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

@@ -24,7 +24,7 @@ public class FIRP0275 extends QCCatalogue {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
             String firstDischargeTime = firstpageStructureMap.get(Content.actualStay).toString();//病案首页出院时间
-            String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength);//出院小结出院时间
+            String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength).replace("天","");//出院小结出院时间
             if (!CatalogueUtil.compareToken(firstDischargeTime, dischargeTime)) {
                 status.set("-1");
             }