|
@@ -29,29 +29,32 @@ public class OPE0323 extends QCCatalogue {
|
|
|
// }
|
|
|
// boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
|
|
|
boolean isOperativePatient = true;//是手术患者(暂时默认是)
|
|
|
- if (isOperativePatient) {
|
|
|
+// if (isOperativePatient) {
|
|
|
List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
|
|
|
- if (ListUtil.isNotEmpty(operationDocs)) {
|
|
|
- long count = operationDocs.stream().filter(operationDoc -> {
|
|
|
- boolean flag = false;
|
|
|
- if (operationDoc.getOperationRecordDoc() != null) {
|
|
|
- String surgeon = operationDoc.getOperationRecordDoc().getStructureMap().get("手术医师");
|
|
|
- String assist1 = operationDoc.getOperationRecordDoc().getStructureMap().get("助手I");
|
|
|
- String signature = operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师签名");
|
|
|
- if (StringUtil.isNotBlank(surgeon) && StringUtil.isNotBlank(assist1)) {
|
|
|
- String operator = surgeon + ", " + assist1;
|
|
|
- if (!operator.contains(signature)) {
|
|
|
- flag = true;
|
|
|
+ if(operationDocs != null && operationDocs.size()>0){
|
|
|
+ if (ListUtil.isNotEmpty(operationDocs)) {
|
|
|
+ long count = operationDocs.stream().filter(operationDoc -> {
|
|
|
+ boolean flag = false;
|
|
|
+ if (operationDoc.getOperationRecordDoc() != null) {
|
|
|
+ String surgeon = operationDoc.getOperationRecordDoc().getStructureMap().get("手术医师");
|
|
|
+ String assist1 = operationDoc.getOperationRecordDoc().getStructureMap().get("助手I");
|
|
|
+ String signature = operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师签名");
|
|
|
+ if (StringUtil.isNotBlank(surgeon) && StringUtil.isNotBlank(assist1)) {
|
|
|
+ String operator = surgeon + ", " + assist1;
|
|
|
+ if (!operator.contains(signature)) {
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ return flag;
|
|
|
+ }).count();
|
|
|
+ if (count > 0) {
|
|
|
+ status.set("-1");
|
|
|
}
|
|
|
- return flag;
|
|
|
- }).count();
|
|
|
- if (count > 0) {
|
|
|
- status.set("-1");
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
}
|