|
@@ -31,10 +31,10 @@ public class BEH0414 extends QCCatalogue {
|
|
String newbornAgeDays = firstpageStructureMap.get(Content.newbornAgeDays);
|
|
String newbornAgeDays = firstpageStructureMap.get(Content.newbornAgeDays);
|
|
String newbornAgeStr = "";
|
|
String newbornAgeStr = "";
|
|
int newbornAge = 0;
|
|
int newbornAge = 0;
|
|
- if (StringUtil.isNotBlank(newbornAgeMonths) && StringUtil.isNotBlank(newbornAgeDays)){
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(newbornAgeMonths) && StringUtil.isNotBlank(newbornAgeDays)) {
|
|
newbornAgeStr = newbornAgeMonths + newbornAgeDays;
|
|
newbornAgeStr = newbornAgeMonths + newbornAgeDays;
|
|
}
|
|
}
|
|
- if (StringUtil.isNotBlank(newbornAgeStr)){
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(newbornAgeStr)) {
|
|
newbornAge = removalUnit(newbornAgeStr);
|
|
newbornAge = removalUnit(newbornAgeStr);
|
|
}
|
|
}
|
|
String admissionAge = beHospitalStructureMap.get(Content.age);
|
|
String admissionAge = beHospitalStructureMap.get(Content.age);
|
|
@@ -42,18 +42,16 @@ public class BEH0414 extends QCCatalogue {
|
|
status.set("0");
|
|
status.set("0");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- String admissAge = "";
|
|
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
|
|
- admissAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
|
|
|
|
|
|
+ admissionAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
|
|
}
|
|
}
|
|
- String firstadmissAge = "";
|
|
|
|
if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("岁")) {
|
|
if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("岁")) {
|
|
- firstadmissAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
|
|
|
|
|
|
+ firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
|
|
}
|
|
}
|
|
// int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
|
|
// int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
|
|
// int admissionAgeNum = removalUnit(admissionAge);
|
|
// int admissionAgeNum = removalUnit(admissionAge);
|
|
// 只比较年龄前的数值
|
|
// 只比较年龄前的数值
|
|
- if (!admissAge.equals(firstadmissAge)) {
|
|
|
|
|
|
+ if (!admissionAge.equals(firstAdmissionAge)) {
|
|
status.set("-1");
|
|
status.set("-1");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -68,7 +66,7 @@ public class BEH0414 extends QCCatalogue {
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
|
|
admissionAge = admissionAge.replaceAll("[岁天]", "");
|
|
admissionAge = admissionAge.replaceAll("[岁天]", "");
|
|
}
|
|
}
|
|
- admissionAge = admissionAge.replaceAll("[^0-9]","");
|
|
|
|
|
|
+ admissionAge = admissionAge.replaceAll("[^0-9]", "");
|
|
if (CatalogueUtil.numbersOnly(admissionAge)) {
|
|
if (CatalogueUtil.numbersOnly(admissionAge)) {
|
|
age = Integer.parseInt(admissionAge);
|
|
age = Integer.parseInt(admissionAge);
|
|
}
|
|
}
|