|
@@ -42,18 +42,18 @@ public class FIRP0161 extends QCCatalogue {
|
|
|
status.set("0");
|
|
|
return;
|
|
|
}
|
|
|
- String admissAge = "";
|
|
|
+// String admissAge = "";
|
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
|
|
|
- admissAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
|
|
|
+ admissionAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
|
|
|
}
|
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("天")) {
|
|
|
- admissAge = admissionAge.substring(0, admissionAge.indexOf("天"));
|
|
|
+ admissionAge = admissionAge.substring(0, admissionAge.indexOf("天"));
|
|
|
}
|
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("分")) {
|
|
|
- admissAge = admissionAge.substring(0, admissionAge.indexOf("分"));
|
|
|
+ admissionAge = admissionAge.substring(0, admissionAge.indexOf("分"));
|
|
|
}
|
|
|
if (StringUtil.isNotBlank(admissionAge) && (admissionAge.contains("时") || admissionAge.contains("小时"))) {
|
|
|
- admissAge = admissionAge.contains("小时") ? admissionAge.substring(0, admissionAge.indexOf("小")) : admissionAge.substring(0, admissionAge.indexOf("时"));
|
|
|
+ admissionAge = admissionAge.contains("小时") ? admissionAge.substring(0, admissionAge.indexOf("小")) : admissionAge.substring(0, admissionAge.indexOf("时"));
|
|
|
}
|
|
|
if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("岁")) {
|
|
|
firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
|
|
@@ -70,7 +70,7 @@ public class FIRP0161 extends QCCatalogue {
|
|
|
// int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
|
|
|
// int admissionAgeNum = removalUnit(admissionAge);
|
|
|
// 只比较年龄前的数值
|
|
|
- if (!admissAge.equals(firstAdmissionAge)) {
|
|
|
+ if (!admissionAge.equals(firstAdmissionAge)) {
|
|
|
status.set("-1");
|
|
|
Map<String, Object> structureExtMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
|
|
|
String xmlId = CatalogueUtil.getXmlId(structureExtMap, Content.age);
|