|
@@ -171,12 +171,6 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
|
|
|
Map<String, String> structureMap = null;
|
|
|
if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
|
|
|
structureMap = (Map) FastJsonUtils.getJsonToMap(content);
|
|
|
- if (structureMap.containsKey("麻醉人员")) {
|
|
|
- structureMap.put("麻醉人员", structureMap.get("麻醉人员").replace("\n", "").replaceAll("麻醉人员签名", ""));
|
|
|
- }
|
|
|
- if (structureMap.containsKey("接生者")) {
|
|
|
- structureMap.put("接生者", structureMap.get("接生者").replace("\n", "").replaceAll("接生者签名", ""));
|
|
|
- }
|
|
|
} else {
|
|
|
String recTitle = contentMap.get("recTitle").toString();
|
|
|
String recTypeId = contentMap.get("recTypeId").toString();
|
|
@@ -195,6 +189,12 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
|
|
|
for (String title : titles) {
|
|
|
eliminateDate(structureMap, title);
|
|
|
}
|
|
|
+ if (structureMap.containsKey("麻醉人员")) {
|
|
|
+ structureMap.put("麻醉人员", structureMap.get("麻醉人员").replace("\n", "").replaceAll("麻醉人员签名", ""));
|
|
|
+ }
|
|
|
+ if (structureMap.containsKey("接生者")) {
|
|
|
+ structureMap.put("接生者", structureMap.get("接生者").replace("\n", "").replaceAll("接生者签名", ""));
|
|
|
+ }
|
|
|
}
|
|
|
if (MapUtils.isNotEmpty(structureMap)) {
|
|
|
OperationRecordDoc operationRecordDoc = ModelDocGenerate.operationRecordDocGen(structureMap);
|