|
@@ -12,6 +12,7 @@ import com.lantone.qc.pub.model.doc.operation.OperationSafetyChecklistDoc;
|
|
import com.lantone.qc.pub.model.doc.operation.PreoperativeDiscussionDoc;
|
|
import com.lantone.qc.pub.model.doc.operation.PreoperativeDiscussionDoc;
|
|
import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
|
|
+import com.lantone.qc.pub.util.MapUtil;
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
import com.lantone.qc.trans.ModelDocTrans;
|
|
import com.lantone.qc.trans.ModelDocTrans;
|
|
import com.lantone.qc.trans.comsis.OrdinaryAssistant;
|
|
import com.lantone.qc.trans.comsis.OrdinaryAssistant;
|
|
@@ -143,7 +144,8 @@ public class ShaoyfOperationDocTrans extends ModelDocTrans {
|
|
sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
|
|
sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
|
|
Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
|
|
Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
|
|
OrdinaryAssistant.removeBlank(structureMap);
|
|
OrdinaryAssistant.removeBlank(structureMap);
|
|
- structureMap.put("主刀医师", structureMap.get("手术医师"));
|
|
|
|
|
|
+// structureMap.put("主刀医师", structureMap.get("手术医师"));
|
|
|
|
+ MapUtil.keyAssig(structureMap,"主刀医师","手术医师");
|
|
ShaoyfOrdinaryAssistant.techTitleDocRemove(structureMap, "主刀医师签名");
|
|
ShaoyfOrdinaryAssistant.techTitleDocRemove(structureMap, "主刀医师签名");
|
|
OperationRecordDoc operationRecordDoc = new OperationRecordDoc();
|
|
OperationRecordDoc operationRecordDoc = new OperationRecordDoc();
|
|
operationRecordDoc.setStructureMap(structureMap);
|
|
operationRecordDoc.setStructureMap(structureMap);
|
|
@@ -203,9 +205,8 @@ public class ShaoyfOperationDocTrans extends ModelDocTrans {
|
|
"参加人员及职称=参加人员",
|
|
"参加人员及职称=参加人员",
|
|
"主刀医师=主刀医师签名",
|
|
"主刀医师=主刀医师签名",
|
|
"术前准备=术前准备内容",
|
|
"术前准备=术前准备内容",
|
|
- "注意事项=术前术后注意事项",
|
|
|
|
|
|
+ "注意事项=可能意外和防范措施",
|
|
"辅助检查结果=辅助检查",
|
|
"辅助检查结果=辅助检查",
|
|
- "术中、术后防范措施=可能意外和防范措施",
|
|
|
|
"现病史- 发病情况=发病经过",
|
|
"现病史- 发病情况=发病经过",
|
|
"本人姓名=姓名",
|
|
"本人姓名=姓名",
|
|
"手术名称=拟行术式",
|
|
"手术名称=拟行术式",
|