医生名称去掉职称 修改

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfOperationDocTrans.java

@@ -15,6 +15,7 @@ import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
+import com.lantone.qc.trans.shaoyf.util.ShaoyfOrdinaryAssistant;
 
 import java.util.List;
 import java.util.Map;
@@ -141,7 +142,8 @@ public class ShaoyfOperationDocTrans extends ModelDocTrans {
         sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
         OrdinaryAssistant.removeBlank(structureMap);
-        structureMap.put("主治医师",structureMap.get("手术医师"));
+        structureMap.put("主治医师", structureMap.get("手术医师"));
+        ShaoyfOrdinaryAssistant.techTitleDocRemove(structureMap, "主刀医师签名");
         OperationRecordDoc operationRecordDoc = new OperationRecordDoc();
         operationRecordDoc.setStructureMap(structureMap);
         operationRecordDoc.setPageData((Map) structureMap);
@@ -154,11 +156,11 @@ public class ShaoyfOperationDocTrans extends ModelDocTrans {
             "开始时间=手术开始时间",
             "医生=主刀医师签名",
             "助手=一助",
-//            "助手II=二助",
+            //            "助手II=二助",
             "补救措施1=补救措施",
             "本人姓名=姓名",
             "二助=助手II"
-//            "医生=手术医师"
+            //            "医生=手术医师"
     );
 
 

trans/src/main/java/com/lantone/qc/trans/shaoyf/util/ShaoyfOrdinaryAssistant.java

@@ -0,0 +1,37 @@
+package com.lantone.qc.trans.shaoyf.util;
+
+import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.collections.MapUtils;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/4/2 14:04
+ */
+public class ShaoyfOrdinaryAssistant {
+
+    /**
+     * 医生签名中，包含职称A/R/F...时，去掉
+     *
+     * @param structureMap
+     * @param key
+     */
+    public static void techTitleDocRemove(Map<String, String> structureMap, String key) {
+        if (MapUtils.isEmpty(structureMap) || StringUtil.isBlank(key)) {
+            return;
+        }
+        String value = structureMap.get(key);
+        if (StringUtil.isBlank(value) || value.length() == 1) {
+            return;
+        }
+        if (value.endsWith("A") || value.endsWith("F") || value.endsWith("R")
+                || value.endsWith("Y") || value.endsWith("I") || value.endsWith("J")
+                || value.endsWith("L") || value.endsWith("b")) {
+            value = value.substring(0, value.length() - 1);
+            structureMap.put(key, value);
+        }
+    }
+
+}