合理用药

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

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.controller.heliyongyao;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,7 +29,7 @@ public class RationalUseController {
 
     @RequestMapping("/jiaoYan")
     @PassToken
-    public ResultVo<String> jiaoYan(@RequestBody XinZhenYiZhu param) {
+    public ResultVo<JSONObject> jiaoYan(@RequestBody XinZhenYiZhu param) {
         return server.jiaoYan(param);
     }
 

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

@@ -48,7 +48,7 @@ public class RationalUseServer {
         this.publicServer = publicServer;
     }
 
-    public ResultVo<String> jiaoYan(XinZhenYiZhu param) {
+    public ResultVo<JSONObject> jiaoYan(XinZhenYiZhu param) {
         log.info("数据：{}", JSON.toJSONString(param));
         String userCode = "99999".equals(TokenUtil.getTokenUserId()) ? param.getUserCode() : TokenUtil.getTokenUserId();
         // 医生信息
@@ -83,10 +83,11 @@ public class RationalUseServer {
         try {
             JSONObject fanHuiXinXi = http.rationalUse(js);
             log.info("返回的数据:{}", fanHuiXinXi);
+            return ResultVoUtil.success(fanHuiXinXi);
         } catch (Exception e) {
             e.printStackTrace();
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络错误");
         }
-        return ResultVoUtil.success();
     }
 
     public Map<String, String> yiShenXinXi(String code) {

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

@@ -370,7 +370,6 @@ public class SetlListUpldService {
         temp.setDiseinfo(EntityCopy.CopyList(dao.zhenDuanXinXi(patNo, times, flag == 1 ? "zy_dis_diag_yb_modify" : "zy_dis_diag_yb"), DiseinfoUpldTemp.class));
         // 费用类型
         temp.setIteminfo(EntityCopy.CopyList(uploadInfo.getData().getIteminfo(), IteminfoUpldTemp.class));
-        log.info("数据：{}", temp.getIteminfo());
         // 计算费用的总和
         if (ListUtil.notBlank(temp.getIteminfo())) {
             temp.setIteminfo(setMedType(temp.getIteminfo()));