|
@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.OutputInfo;
|
|
import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
|
|
import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
|
|
import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
|
|
import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
|
|
import com.lantone.qc.pub.model.doc.consultation.ConsultationRecordDoc;
|
|
import com.lantone.qc.pub.model.doc.consultation.ConsultationRecordDoc;
|
|
|
|
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
@@ -40,12 +41,12 @@ public class CON0281 extends QCCatalogue {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
for (ConsultationDoc consultationDoc : consultationDocs) {
|
|
for (ConsultationDoc consultationDoc : consultationDocs) {
|
|
- ConsultationRecordDoc consultationRecordDoc = consultationDoc.getConsultationRecordDoc();
|
|
|
|
- if (consultationRecordDoc == null) {
|
|
|
|
|
|
+ ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
|
|
|
|
+ if (consultationResultsDoc == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- Map<String, String> conStructureMap = consultationRecordDoc.getStructureMap();
|
|
|
|
- if (conStructureMap.get("会诊分类") == null || !conStructureMap.get("会诊分类").contains("急会诊")) {
|
|
|
|
|
|
+ Map<String, String> conStructureMap = consultationResultsDoc.getStructureMap();
|
|
|
|
+ if (conStructureMap.get("会诊类别") == null || !conStructureMap.get("会诊类别").contains("急会诊")) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
for (DoctorAdviceDoc doctorAdviceDoc : doctorAdviceDocs) {//循环取最近一条医嘱和会诊申请单中的急会诊比较
|
|
for (DoctorAdviceDoc doctorAdviceDoc : doctorAdviceDocs) {//循环取最近一条医嘱和会诊申请单中的急会诊比较
|