|
@@ -2,6 +2,7 @@ package com.lantone.qc.kernel.catalogue.clinicalblood;
|
|
|
|
|
|
import com.lantone.qc.kernel.catalogue.QCCatalogue;
|
|
import com.lantone.qc.kernel.catalogue.QCCatalogue;
|
|
import com.lantone.qc.kernel.util.CatalogueUtil;
|
|
import com.lantone.qc.kernel.util.CatalogueUtil;
|
|
|
|
+import com.lantone.qc.pub.Content;
|
|
import com.lantone.qc.pub.model.InputInfo;
|
|
import com.lantone.qc.pub.model.InputInfo;
|
|
import com.lantone.qc.pub.model.OutputInfo;
|
|
import com.lantone.qc.pub.model.OutputInfo;
|
|
import com.lantone.qc.pub.model.doc.ClinicBloodEffectDoc;
|
|
import com.lantone.qc.pub.model.doc.ClinicBloodEffectDoc;
|
|
@@ -33,9 +34,10 @@ public class CLI03063 extends QCCatalogue {
|
|
}
|
|
}
|
|
Iterator<ClinicalBloodDoc> clinicalBloodDocIterator = clinicalBloodDocs.iterator();
|
|
Iterator<ClinicalBloodDoc> clinicalBloodDocIterator = clinicalBloodDocs.iterator();
|
|
Iterator<ClinicBloodEffectDoc> clinicBloodEffectDocIterator = clinicBloodEffectDocs.iterator();
|
|
Iterator<ClinicBloodEffectDoc> clinicBloodEffectDocIterator = clinicBloodEffectDocs.iterator();
|
|
|
|
+ String key = getKeyByHospitalId();
|
|
while (clinicalBloodDocIterator.hasNext()) {
|
|
while (clinicalBloodDocIterator.hasNext()) {
|
|
if (!CatalogueUtil.compareTime(
|
|
if (!CatalogueUtil.compareTime(
|
|
- StringUtil.parseDateTime(clinicalBloodDocIterator.next().getStructureMap().get("记录时间")),
|
|
|
|
|
|
+ StringUtil.parseDateTime(clinicalBloodDocIterator.next().getStructureMap().get(key)),
|
|
StringUtil.parseDateTime(DateUtil.nowString()),
|
|
StringUtil.parseDateTime(DateUtil.nowString()),
|
|
Long.valueOf(24 * 60))) {//如果接收未超过24小时,规则不判断
|
|
Long.valueOf(24 * 60))) {//如果接收未超过24小时,规则不判断
|
|
clinicalBloodDocIterator.remove();
|
|
clinicalBloodDocIterator.remove();
|
|
@@ -43,7 +45,7 @@ public class CLI03063 extends QCCatalogue {
|
|
}
|
|
}
|
|
while (clinicBloodEffectDocIterator.hasNext()) {
|
|
while (clinicBloodEffectDocIterator.hasNext()) {
|
|
if (!CatalogueUtil.compareTime(
|
|
if (!CatalogueUtil.compareTime(
|
|
- StringUtil.parseDateTime(clinicBloodEffectDocIterator.next().getStructureMap().get("记录时间")),
|
|
|
|
|
|
+ StringUtil.parseDateTime(clinicBloodEffectDocIterator.next().getStructureMap().get(key)),
|
|
StringUtil.parseDateTime(DateUtil.nowString()),
|
|
StringUtil.parseDateTime(DateUtil.nowString()),
|
|
Long.valueOf(24 * 60))) {//如果接收未超过24小时,规则不判断
|
|
Long.valueOf(24 * 60))) {//如果接收未超过24小时,规则不判断
|
|
clinicBloodEffectDocIterator.remove();
|
|
clinicBloodEffectDocIterator.remove();
|
|
@@ -51,14 +53,14 @@ public class CLI03063 extends QCCatalogue {
|
|
}
|
|
}
|
|
Collections.sort(clinicalBloodDocs, new Comparator<ClinicalBloodDoc>() {
|
|
Collections.sort(clinicalBloodDocs, new Comparator<ClinicalBloodDoc>() {
|
|
public int compare(ClinicalBloodDoc o1, ClinicalBloodDoc o2) {
|
|
public int compare(ClinicalBloodDoc o1, ClinicalBloodDoc o2) {
|
|
- return o1.getStructureMap().get("记录时间")
|
|
|
|
- .compareTo(o2.getStructureMap().get("记录时间"));
|
|
|
|
|
|
+ return o1.getStructureMap().get(key)
|
|
|
|
+ .compareTo(o2.getStructureMap().get(key));
|
|
}
|
|
}
|
|
});
|
|
});
|
|
Collections.sort(clinicBloodEffectDocs, new Comparator<ClinicBloodEffectDoc>() {
|
|
Collections.sort(clinicBloodEffectDocs, new Comparator<ClinicBloodEffectDoc>() {
|
|
public int compare(ClinicBloodEffectDoc o1, ClinicBloodEffectDoc o2) {
|
|
public int compare(ClinicBloodEffectDoc o1, ClinicBloodEffectDoc o2) {
|
|
- return o1.getStructureMap().get("记录时间")
|
|
|
|
- .compareTo(o2.getStructureMap().get("记录时间"));
|
|
|
|
|
|
+ return o1.getStructureMap().get(key)
|
|
|
|
+ .compareTo(o2.getStructureMap().get(key));
|
|
}
|
|
}
|
|
});
|
|
});
|
|
if (clinicalBloodDocs.size() != clinicBloodEffectDocs.size()) {
|
|
if (clinicalBloodDocs.size() != clinicBloodEffectDocs.size()) {
|
|
@@ -68,12 +70,12 @@ public class CLI03063 extends QCCatalogue {
|
|
for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocs) {
|
|
for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocs) {
|
|
for (ClinicBloodEffectDoc clinicBloodEffectDoc : clinicBloodEffectDocs) {
|
|
for (ClinicBloodEffectDoc clinicBloodEffectDoc : clinicBloodEffectDocs) {
|
|
if (CatalogueUtil.compareTime(
|
|
if (CatalogueUtil.compareTime(
|
|
- StringUtil.parseDateTime(clinicalBloodDoc.getStructureMap().get("记录时间")),
|
|
|
|
- StringUtil.parseDateTime(clinicBloodEffectDoc.getStructureMap().get("记录时间")),
|
|
|
|
|
|
+ StringUtil.parseDateTime(clinicalBloodDoc.getStructureMap().get(key)),
|
|
|
|
+ StringUtil.parseDateTime(clinicBloodEffectDoc.getStructureMap().get(key)),
|
|
Long.valueOf(1))) {//结果单时间要比申请单大的
|
|
Long.valueOf(1))) {//结果单时间要比申请单大的
|
|
if (CatalogueUtil.compareTime(
|
|
if (CatalogueUtil.compareTime(
|
|
- StringUtil.parseDateTime(clinicalBloodDoc.getStructureMap().get("记录时间")),
|
|
|
|
- StringUtil.parseDateTime(clinicBloodEffectDoc.getStructureMap().get("记录时间")),
|
|
|
|
|
|
+ StringUtil.parseDateTime(clinicalBloodDoc.getStructureMap().get(key)),
|
|
|
|
+ StringUtil.parseDateTime(clinicBloodEffectDoc.getStructureMap().get(key)),
|
|
Long.valueOf(24 * 60))) {//未超过24小时
|
|
Long.valueOf(24 * 60))) {//未超过24小时
|
|
status.set("-1");
|
|
status.set("-1");
|
|
return ;
|
|
return ;
|
|
@@ -94,4 +96,13 @@ public class CLI03063 extends QCCatalogue {
|
|
|
|
|
|
*/
|
|
*/
|
|
}
|
|
}
|
|
|
|
+ private String getKeyByHospitalId() {
|
|
|
|
+ switch (Content.hospital_Id)
|
|
|
|
+ {
|
|
|
|
+ case "7": //厦门
|
|
|
|
+ return "病历日期";
|
|
|
|
+ default:
|
|
|
|
+ return "记录时间";
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|