优化

src/main/java/thyyxxk/webserver/constants/sidicts/SiFunction.java

@@ -676,6 +676,13 @@ public enum SiFunction {
      * 定点医药机构药师审核电子处方，并上传审核结果。
      * */
     RX_CHECK_UPLOAD("7206", ""),
+
+    /**
+     * 通过此交易，定点医药机构查询可开具或取药的电子处方药品目录范围。
+     * */
+    RX_QUERY_MEDICINE("7211", ""),
+
+
     /* =========================================== 签到签退 ========================================== */
     /**
      * 通过此交易进行调用方签到（签到）

src/main/java/thyyxxk/webserver/service/medicalinsurance/ExecService.java

@@ -151,10 +151,4 @@ public class ExecService {
             return object;
         }
     }
-
-    public JSONObject executeTrade(String input, SiFunction function) {
-        JSONObject object = JSONObject.parseObject(input);
-        return executeTrade(object, function);
-    }
-
 }

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiManageService.java

@@ -350,7 +350,7 @@ public class SiManageService {
             ZipUtil.deleteFile(filename);
             String fsUploadIn = "{\"filename\": \"" + filename + ".zip\", \"fixmedins_code\": \"" +
                     SiUtil.INSTITUTION_ID + "\", \"in\": " + Arrays.toString(ZipUtil.zipFileToBytes(zipFile)) + "}";
-            ResultVo<String> uplRes = upldServcie.uploadFile(JSONObject.parseObject(fsUploadIn), filename);
+            ResultVo<String> uplRes = upldServcie.uploadFile(JSONObject.parseObject(fsUploadIn));
             ZipUtil.deleteFile(zipFile);
             if (uplRes.getCode().equals(ExceptionEnum.SUCCESS.getCode())) {
                 setlChk.setFileQuryNo(uplRes.getData());
@@ -362,7 +362,7 @@ public class SiManageService {
         String ref = JSONObject.toJSONStringWithDateFormat(setlChk, "yyyy-MM-dd");
         input.getJSONObject("input").put("data", JSONObject.parseObject(ref));
         JSONObject result = exec.executeTrade(input, SiFunction.INSTITUTION_SETTLEMENT_DETAIL_CHECK);
-        log.info("【操作员：{}】，医药机构费用结算对明细账：\n参数：{}，\n结果：{}", TokenUtil.getInstance().getTokenUserId(), input, result);
+        log.info("医药机构费用结算对明细账：\n参数：{}，\n结果：{}", input, result);
         if (null == result) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
         }

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiUploadService.java

@@ -9,7 +9,6 @@ import thyyxxk.webserver.constants.sidicts.SiFunction;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.SiUtil;
-import thyyxxk.webserver.utils.TokenUtil;
 
 /**
  * @description: 医保上传服务
@@ -35,18 +34,18 @@ public class SiUploadService {
         fsUploadIn.put("in", file);
         fsUploadIn.put("filename", fileName);
         fsUploadIn.put("fixmedins_code", SiUtil.INSTITUTION_ID);
-        return getStringResultVo(fileName, input, fsUploadIn);
+        return getStringResultVo(input, fsUploadIn);
     }
 
-    public ResultVo<String> uploadFile(JSONObject fsUploadIn, String fileName) {
+    public ResultVo<String> uploadFile(JSONObject fsUploadIn) {
         JSONObject input = exec.makeTradeHeader(SiFunction.UPLOAD_FILE);
-        return getStringResultVo(fileName, input, fsUploadIn);
+        return getStringResultVo(input, fsUploadIn);
     }
 
-    private ResultVo<String> getStringResultVo(String fileName, JSONObject input, JSONObject fsUploadIn) {
+    private ResultVo<String> getStringResultVo(JSONObject input, JSONObject fsUploadIn) {
         input.getJSONObject("input").put("fsUploadIn", fsUploadIn);
         JSONObject result = exec.executeTrade(input, SiFunction.UPLOAD_FILE);
-        log.info("【操作员：{}】上传文件：\n参数：{}，\n结果：{}", TokenUtil.getInstance().getTokenUserId(), input, result);
+        log.info("上传文件：{}", result);
         if (null == result) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
         }

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

@@ -314,5 +314,20 @@ public class StringUtil {
         return c;
     }
 
+    public static boolean isEmpty(String[] string) {
+        return string == null || string.length == 0;
+    }
+
+    public static boolean isEmpty(String string) {
+        return string == null || string.trim().isEmpty() || "null".equals(string.trim());
+    }
+
+    public static boolean isNotEmpty(String string) {
+        return !isEmpty(string);
+    }
+
+    public static boolean isEmpty(Object o) {
+        return o == null || "".equals(o);
+    }
 }