增加为空时的处理

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_MdmController.java

@@ -26,6 +26,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 回访模板管理
@@ -64,6 +66,7 @@ public class Api_MdmController {
         System.out.println("head: " + headMap.toString());
         System.out.println("Request Body: " + requestBody);
         //处理body数据
+        requestBody = replaceNullInRequestBody(requestBody);
         JSONObject jsonBodyObject = new JSONObject(requestBody);
         JSONObject jsonRequest = new JSONObject(jsonBodyObject.get("Request"));
         //处理Head数据
@@ -147,7 +150,9 @@ public class Api_MdmController {
         wardInfo.setWb(jsonObject.get("wb").toString());
         wardInfo.setInputCode(jsonObject.get("inputCode").toString());
         String bedNumber=jsonObject.get("bedNumber").toString();
-        wardInfo.setBedNumber(Long.valueOf(bedNumber));
+        if(bedNumber!=null&&bedNumber!=""&&!bedNumber.equals("null")&&!bedNumber.isEmpty()){
+            wardInfo.setBedNumber(Long.valueOf(bedNumber));
+        }
         wardInfo.setWardTypeCode(jsonObject.get("wardTypeCode").toString());
         wardInfo.setHomeBedSign(jsonObject.get("homeBedSign").toString());
         wardInfo.setSpecialWardSign(jsonObject.get("specialWardSign").toString());
@@ -262,7 +267,7 @@ public class Api_MdmController {
         employeeInfo.setEmergencyMedFee(jsonObject.get("emergencyMedFee").toString());
         employeeInfo.setEmergencyTreatFee(jsonObject.get("emergencyTreatFee").toString());
         String degreeCode=jsonObject.get("degreeCode").toString();
-        if(degreeCode!=null&&degreeCode!=""&&!degreeCode.equals("null")){
+        if(degreeCode!=null&&degreeCode!=""&&!degreeCode.equals("null")&&!degreeCode.isEmpty()){
             employeeInfo.setDegreeCode(Long.valueOf(degreeCode));
         }
         employeeInfo.setPhotoUrl(jsonObject.get("photoUrl").toString());
@@ -543,7 +548,7 @@ public class Api_MdmController {
         employeeInfo.setEmergencyMedFee(jsonObject.get("emergencyMedFee").toString());
         employeeInfo.setEmergencyTreatFee(jsonObject.get("emergencyTreatFee").toString());
         String degreeCode=jsonObject.get("degreeCode").toString();
-        if(degreeCode!=null&&degreeCode!=""&&!degreeCode.equals("null")){
+        if(degreeCode!=null&&degreeCode!=""&&!degreeCode.isEmpty()&&!degreeCode.equals("null")){
             employeeInfo.setDegreeCode(Long.valueOf(degreeCode));
         }
         employeeInfo.setPhotoUrl(jsonObject.get("photoUrl").toString());
@@ -888,7 +893,9 @@ public class Api_MdmController {
         deptInfo.setAccountDeptCode(jsonObject.get("accountDeptCode").toString());
         deptInfo.setAccountDeptName(jsonObject.get("accountDeptName").toString());
         String deptTypeCode=jsonObject.get("deptTypeCode").toString();
-        deptInfo.setDeptTypeCode(Long.valueOf(deptTypeCode));
+        if(deptTypeCode!=null&&deptTypeCode!=""&&!deptTypeCode.equals("null")&&!deptTypeCode.isEmpty()){
+            deptInfo.setDeptTypeCode(Long.valueOf(deptTypeCode));
+        }
         deptInfo.setDeptAddr(jsonObject.get("deptAddr").toString());
         String depositWarLine=jsonObject.get("depositWarLine").toString();
         deptInfo.setDepositWarLine(new BigDecimal(depositWarLine));
@@ -1000,4 +1007,13 @@ public class Api_MdmController {
         }
         return issuccess;
     }
+
+    /*
+     * 使用正则表达式匹配"null"并替换为""
+     * */
+    private static String replaceNullInRequestBody(String body) {
+        Pattern pattern = Pattern.compile("null");
+        Matcher matcher = pattern.matcher(body);
+        return matcher.replaceAll("\"\"");
+    }
 }