|
@@ -35,7 +35,7 @@ public class THR0126 extends QCCatalogue {
|
|
String admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
|
|
String admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
|
|
//出院日期
|
|
//出院日期
|
|
String dischargeTime = medicalRecordInfoDoc.getStructureMap().get("leaveHospitalDate");
|
|
String dischargeTime = medicalRecordInfoDoc.getStructureMap().get("leaveHospitalDate");
|
|
- if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
|
|
|
|
|
|
+ if (CatalogueUtil.isEmpty(admisTime)) {
|
|
status.set("0");
|
|
status.set("0");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -47,7 +47,7 @@ public class THR0126 extends QCCatalogue {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
//如果住院天数小于2天则不判断该条规则
|
|
//如果住院天数小于2天则不判断该条规则
|
|
- if (DateUtil.parseDate(dischargeTime) != null && StringUtil.isNotEmpty(dischargeTime) &&
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(dischargeTime) && DateUtil.parseDate(dischargeTime) != null && StringUtil.isNotEmpty(dischargeTime) &&
|
|
!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(dischargeTime), (long) (48 * 60))) {
|
|
!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(dischargeTime), (long) (48 * 60))) {
|
|
status.set("0");
|
|
status.set("0");
|
|
return;
|
|
return;
|
|
@@ -61,17 +61,13 @@ public class THR0126 extends QCCatalogue {
|
|
// if (inputInfo.getBeHospitalizedDoc() != null) {
|
|
// if (inputInfo.getBeHospitalizedDoc() != null) {
|
|
// Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
|
|
// Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
|
|
// String admisTime = beHospitalStructureMap.get("入院日期");
|
|
// String admisTime = beHospitalStructureMap.get("入院日期");
|
|
- if (CatalogueUtil.isEmpty(admisTime)) {
|
|
|
|
- status.set("0");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- if (!CatalogueUtil.compareTime(
|
|
|
|
- StringUtil.parseDateTime(admisTime),
|
|
|
|
- StringUtil.parseDateTime(DateUtil.nowString()),
|
|
|
|
- Long.valueOf(48 * 60))) {//如果入院未超过48小时,规则不判断
|
|
|
|
- status.set("0");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+// if (!CatalogueUtil.compareTime(
|
|
|
|
+// StringUtil.parseDateTime(admisTime),
|
|
|
|
+// StringUtil.parseDateTime(DateUtil.nowString()),
|
|
|
|
+// Long.valueOf(48 * 60))) {//如果入院未超过48小时,规则不判断
|
|
|
|
+// status.set("0");
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
//开始时间(入院时间)
|
|
//开始时间(入院时间)
|
|
Date beginDate = StringUtil.parseDateTime(admisTime);
|
|
Date beginDate = StringUtil.parseDateTime(admisTime);
|
|
if (beginDate == null) {
|
|
if (beginDate == null) {
|