|
@@ -52,21 +52,27 @@ public class THR02900 extends QCCatalogue {
|
|
|
}
|
|
|
Map<String, String> structureMap = operationRecordDoc.getStructureMap();
|
|
|
String opeAssName = structureMap.get("手术人员");
|
|
|
+ firstAssistant = structureMap.get("一助");
|
|
|
+ if(StringUtil.isBlank(firstAssistant)){
|
|
|
+ firstAssistant = structureMap.get("助手(一、二)");
|
|
|
+ }
|
|
|
if (StringUtil.isNotBlank(opeAssName)) {
|
|
|
split = opeAssName.split(" ");
|
|
|
- firstAssistant = structureMap.get("助手");
|
|
|
opeEndTime = structureMap.get("手术日期");
|
|
|
} else {
|
|
|
- firstAssistant = structureMap.get("一助");
|
|
|
//取得手术时间截取结束时间(格式 2020-07-24 10:30-2020-07-24 11:45)
|
|
|
String key = getKeyByHospitalId();
|
|
|
opeEndTime = structureMap.get(key);
|
|
|
opeEndTime = getTime(opeEndTime, structureMap);
|
|
|
}
|
|
|
String chiefSurgeon = structureMap.get("主刀医师");
|
|
|
+ if(StringUtil.isBlank(chiefSurgeon)){
|
|
|
+ chiefSurgeon = structureMap.get("手术者");
|
|
|
+ }
|
|
|
if (opeEndTime.contains("年月日")) {
|
|
|
continue;
|
|
|
}
|
|
|
+ opeEndTime = opeEndTime.replace(" 时","时");
|
|
|
Date opeEndDate = CatalogueUtil.parseStringDate(opeEndTime);
|
|
|
if (opeEndDate == null) {
|
|
|
continue;
|