合理用药和医嘱录入bug

src/main/java/thyyxxk/webserver/controller/heliyongyao/RationalUseController.java

@@ -28,9 +28,13 @@ public class RationalUseController {
 
     @GetMapping("/rationalUseOfMedicine")
     public ResultVo<JSONObject> rationalUseOfMedicine(@RequestParam("patNo") String patNo,
-                                                  @RequestParam("times") Integer times) {
+                                                      @RequestParam("times") Integer times) {
         return server.rationalUseOfMedicine(patNo, times);
     }
 
+    @GetMapping("/auditingInterface")
+    public ResultVo<JSONObject> auditingInterface(@RequestParam("url") String url) {
+        return server.auditingInterface(url);
+    }
 
 }

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/YizhuLuRuController.java

@@ -97,8 +97,9 @@ public class YizhuLuRuController {
     @GetMapping("/huoQuFeiYongXinXi")
     public ResultVo<Map<String, Object>> huoQuFeiYongXinXi(@RequestParam("code") String code,
                                                            @RequestParam("serial") String serial,
-                                                           @RequestParam("deptCode") String deptCode) {
-        return server.huoQuFeiYongXinXi(code, serial, deptCode);
+                                                           @RequestParam("deptCode") String deptCode,
+                                                           @RequestParam("groupNo") String groupNo) {
+        return server.huoQuFeiYongXinXi(code, serial, deptCode,groupNo);
     }
 
     @PostMapping("/deleteMultipleOrders")

src/main/java/thyyxxk/webserver/service/externalhttp/RationalUseSrvc.java

@@ -1,9 +1,7 @@
 package thyyxxk.webserver.service.externalhttp;
 
 import com.alibaba.fastjson.JSONObject;
-import com.dtflys.forest.annotation.BaseRequest;
-import com.dtflys.forest.annotation.JSONBody;
-import com.dtflys.forest.annotation.Post;
+import com.dtflys.forest.annotation.*;
 
 /**
  * <p>
@@ -13,7 +11,6 @@ import com.dtflys.forest.annotation.Post;
  * @author xc
  * @date 2022-03-29 11:42
  */
-@BaseRequest(baseURL = "http://172.16.32.121:8016")
 public interface RationalUseSrvc {
 
     /**
@@ -22,7 +19,10 @@ public interface RationalUseSrvc {
      * @param str 药品信息
      * @return 返回
      */
-    @Post("/Audit.ashx")
+    @Post("http://172.16.32.121:8016/Audit.ashx")
     JSONObject rationalUse(@JSONBody String str);
 
+    @Get("${url}")
+    JSONObject auditingInterface(@Var("url") String url);
+
 }

src/main/java/thyyxxk/webserver/service/heliyongyao/RationalUseServer.java

@@ -62,6 +62,16 @@ public class RationalUseServer {
         return ResultVoUtil.success(js);
     }
 
+    /**
+     * 调用药品审方接口
+     *
+     * @param url 审方地址
+     * @return 返回提示
+     */
+    public ResultVo<JSONObject> auditingInterface(String url) {
+        return ResultVoUtil.success(http.auditingInterface(url));
+    }
+
     public JSONObject verify(XinZhenYiZhu param) {
         String userCode = TokenUtil.getTokenUserId();
         // 医生信息

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -3,6 +3,7 @@ package thyyxxk.webserver.service.zhuyuanyisheng;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -703,7 +704,8 @@ public class YiZhuLuRuServer {
      * @param serial 00-项目 01-小包装的药品 99-大包装
      * @return 返回该费用的一些详细信息，以及一些提示信息。
      */
-    public ResultVo<Map<String, Object>> huoQuFeiYongXinXi(String code, String serial, String deptCode) {
+    @DS("his")
+    public ResultVo<Map<String, Object>> huoQuFeiYongXinXi(String code, String serial, String deptCode, String groupNo) {
         Map<String, Object> map = new HashMap<>();
         // 一些提示
         List<String> prompt = new ArrayList<>();
@@ -739,7 +741,7 @@ public class YiZhuLuRuServer {
                 }
             }
         } else {
-            YaoPinXinXi yp = dao.huoQuYaoPin(code.trim() + serial.trim(), publicServer.getGroupNo());
+            YaoPinXinXi yp = dao.huoQuYaoPin(code.trim() + serial.trim(), groupNo);
             if (StringUtil.notBlank(deptCode)) {
                 if (dao.restrictedUseInTheDepartment(code.trim(), deptCode) > 0) {
                     return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "该药品禁止在患者所在的科室使用。");

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

@@ -11,13 +11,12 @@ import java.util.List;
  * @date 2021-09-18 09:10
  */
 public class ListUtil {
-
     public static boolean isBlank(List<?> list) {
         return list == null || list.isEmpty();
     }
 
     public static boolean notBlank(List<?> list) {
-        return list != null && !list.isEmpty();
+        return !isBlank(list);
     }
 
 }