|
@@ -31,10 +31,10 @@ public class FIRP0161 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);
|
|
@@ -46,6 +46,9 @@ public class FIRP0161 extends QCCatalogue {
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
|
|
if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
|
|
admissAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
|
|
admissAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
|
|
}
|
|
}
|
|
|
|
+ if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("天")) {
|
|
|
|
+ admissAge = admissionAge.substring(0, admissionAge.indexOf("天"));
|
|
|
|
+ }
|
|
// int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
|
|
// int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
|
|
// int admissionAgeNum = removalUnit(admissionAge);
|
|
// int admissionAgeNum = removalUnit(admissionAge);
|
|
// 只比较年龄前的数值
|
|
// 只比较年龄前的数值
|
|
@@ -69,7 +72,7 @@ public class FIRP0161 extends QCCatalogue {
|
|
}
|
|
}
|
|
// 解决邵逸夫数据,年龄后跟着身份证号码
|
|
// 解决邵逸夫数据,年龄后跟着身份证号码
|
|
admissionAge = RegularUtil.ClearBracket(admissionAge);
|
|
admissionAge = RegularUtil.ClearBracket(admissionAge);
|
|
- 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);
|
|
}
|
|
}
|