修复首页无法保存切口愈合等级的问题

src/main/java/thyyxxk/webserver/entity/casefrontsheet/CaseFrontsheetSurgery.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import thyyxxk.webserver.utils.FilterUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
 import java.util.Date;
@@ -130,91 +131,11 @@ public class CaseFrontsheetSurgery implements Serializable {
 
 	public String getCutHeal() {
 		if (StringUtil.isBlank(cutHeal)) {
-			if (getCut() != null && getHeal() != null) {
-				String first = getCutHealFirstPart(getCut());
-				String last = getCutHealLastPart(getHeal());
-				return first + "/" + last;
-			} else {
-				return "";
-			}
+			return FilterUtil.combineCutHeal(getCut(), getHeal());
 		}
 		return cutHeal.trim();
 	}
 
-	private String getCutHealFirstPart(String cut) {
-		switch (cut) {
-			case "0":
-				return "0";
-			case "1":
-				return "Ⅰ";
-			case "2":
-				return "Ⅱ";
-			case "3":
-				return "Ⅲ";
-			default:
-				return null;
-		}
-	}
-
-	private String getCutHealLastPart(String heal) {
-		switch (heal) {
-			case "0":
-				return "0";
-			case "1":
-				return "甲";
-			case "2":
-				return "乙";
-			case "3":
-				return "丙";
-			default:
-				return null;
-		}
-	}
-
-	public String getCut() {
-		if (StringUtil.notBlank(cut)) {
-			return cut.trim();
-		}
-		if (StringUtil.isBlank(cutHeal)) {
-			return null;
-		}
-		String[] arrs = cutHeal.split("/");
-		switch (arrs[0]) {
-			case "0":
-				return "0";
-			case "Ⅰ":
-				return "1";
-			case "Ⅱ":
-				return "2";
-			case "Ⅲ":
-				return "3";
-			default:
-				return null;
-		}
-	}
-
-	public String getHeal() {
-		if (StringUtil.notBlank(heal)) {
-			return heal.trim();
-		}
-		if (StringUtil.isBlank(cutHeal)) {
-			return null;
-		}
-		String[] arrs = cutHeal.split("/");
-		switch (arrs[1]) {
-			case "0":
-				return "0";
-			case "甲":
-				return "1";
-			case "乙":
-				return "2";
-			case "丙":
-				return "3";
-			default:
-				return null;
-		}
-	}
-
 	public Integer getType() {
 		return null == type ? 9 : type;
 	}

src/main/java/thyyxxk/webserver/entity/casefrontsheet/request/casefrontsheet/CaseFrontsheetSurgery.java

@@ -3,6 +3,7 @@ package thyyxxk.webserver.entity.casefrontsheet.request.casefrontsheet;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import thyyxxk.webserver.utils.FilterUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
 import java.io.Serializable;
@@ -129,89 +130,23 @@ public class CaseFrontsheetSurgery implements Serializable {
 
 	public String getCutHeal() {
 		if (StringUtil.isBlank(cutHeal)) {
-			if (getCut() != null && getHeal() != null) {
-				String first = getCutHealFirstPart(getCut());
-				String last = getCutHealLastPart(getHeal());
-				return first + "/" + last;
-			} else {
-				return "";
-			}
+			return FilterUtil.combineCutHeal(getCut(), getHeal());
 		}
 		return cutHeal.trim();
 	}
 
-	private String getCutHealFirstPart(String cut) {
-		switch (cut) {
-			case "0":
-				return "0";
-			case "1":
-				return "Ⅰ";
-			case "2":
-				return "Ⅱ";
-			case "3":
-				return "Ⅲ";
-			default:
-				return null;
-		}
-	}
-
-	private String getCutHealLastPart(String heal) {
-		switch (heal) {
-			case "0":
-				return "0";
-			case "1":
-				return "甲";
-			case "2":
-				return "乙";
-			case "3":
-				return "丙";
-			default:
-				return null;
-		}
-	}
-
 	public String getCut() {
 		if (StringUtil.notBlank(cut)) {
 			return cut.trim();
 		}
-		if (StringUtil.isBlank(cutHeal)) {
-			return null;
-		}
-		String[] arrs = cutHeal.split("/");
-		switch (arrs[0]) {
-			case "0":
-				return "0";
-			case "Ⅰ":
-				return "1";
-			case "Ⅱ":
-				return "2";
-			case "Ⅲ":
-				return "3";
-			default:
-				return null;
-		}
+		return FilterUtil.filterCut(cutHeal);
 	}
 
 	public String getHeal() {
 		if (StringUtil.notBlank(heal)) {
 			return heal.trim();
 		}
-		if (StringUtil.isBlank(cutHeal)) {
-			return null;
-		}
-		String[] arrs = cutHeal.split("/");
-		switch (arrs[1]) {
-			case "0":
-				return "0";
-			case "甲":
-				return "1";
-			case "乙":
-				return "2";
-			case "丙":
-				return "3";
-			default:
-				return null;
-		}
+		return FilterUtil.filterHeal(cutHeal);
 	}
 
 	public Integer getType() {

src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -759,6 +759,8 @@ public class CaseFrontSheetMainService {
                 item.setNo(i + 1);
                 item.setBah(bah);
                 item.setTimes(times);
+                item.setCut(FilterUtil.filterCut(item.getCutHeal()));
+                item.setHeal(FilterUtil.filterHeal(item.getCutHeal()));
                 dao.writeNewZySurgeryRecord(item);
             }
         }

src/main/java/thyyxxk/webserver/utils/FilterUtil.java

@@ -579,4 +579,81 @@ public class FilterUtil {
         }
     }
 
+    public static String filterCut(String cutHeal) {
+        if (StringUtil.isBlank(cutHeal)) {
+            return null;
+        }
+        String[] arrs = cutHeal.split("/");
+        switch (arrs[0]) {
+            case "0":
+                return "0";
+            case "Ⅰ":
+                return "1";
+            case "Ⅱ":
+                return "2";
+            case "Ⅲ":
+                return "3";
+            default:
+                return null;
+        }
+    }
+
+    public static String filterHeal(String cutHeal) {
+        if (StringUtil.isBlank(cutHeal)) {
+            return null;
+        }
+        String[] arrs = cutHeal.split("/");
+        switch (arrs[1]) {
+            case "0":
+                return "0";
+            case "甲":
+                return "1";
+            case "乙":
+                return "2";
+            case "丙":
+                return "3";
+            default:
+                return null;
+        }
+    }
+
+    public static String filterCutHealFirstPart(String cut) {
+        switch (cut) {
+            case "0":
+                return "0";
+            case "1":
+                return "Ⅰ";
+            case "2":
+                return "Ⅱ";
+            case "3":
+                return "Ⅲ";
+            default:
+                return null;
+        }
+    }
+
+    public static String filterCutHealLastPart(String heal) {
+        switch (heal) {
+            case "0":
+                return "0";
+            case "1":
+                return "甲";
+            case "2":
+                return "乙";
+            case "3":
+                return "丙";
+            default:
+                return null;
+        }
+    }
+
+    public static String combineCutHeal(String cut, String heal) {
+        if (cut != null && heal != null) {
+            String first = FilterUtil.filterCutHealFirstPart(cut);
+            String last = FilterUtil.filterCutHealLastPart(heal);
+            return first + "/" + last;
+        } else {
+            return "";
+        }
+    }
 }