检验接口

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>11.4.0</version>
+    <version>11.4.1</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/emr/EmrControlRuleController.java

@@ -105,6 +105,7 @@ public class EmrControlRuleController {
     }
 
     @GetMapping("/getMyUnlockByPatNo")
+    @PassToken
     public ResultVo<EmrLimitUnlock> getMyUnlockByPatNo(@RequestParam("patNo") String patNo,
                                                        @RequestParam("times") Integer times) {
         return server.getMyUnlockByPatNo(patNo, times);

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -46,13 +46,55 @@ public interface JianYanJianChaDao {
     List<YshYjReq> huoQuJianChaShenQingV2(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
 
-    @Select("select *," +
-            "  inspect_stuff_name = (select rtrim(name) from jy_zd_sample with (NOLOCK) where code = inspect_stuff), " +
-            "       req_dept_name   = (select rtrim(name) from zd_unit_code where code = req_dept), " +
-            "       req_doctor_name = (select rtrim(name) from a_employee_mi where code = req_doctor)," +
-            "       case  when req_type = '2' then (select rtrim(class) from jy_zd_item c where c.zy_order_code = order_code) " +
-            "        else '00' end classes  " +
-            "from ysh_yj_req with (NOLOCK) " +
+    @Select("select                   req_no,\n" +
+            "                         inpatient_no,\n" +
+            "                         p_name,\n" +
+            "                         p_age,\n" +
+            "                         admiss_times,\n" +
+            "                         bed_no,\n" +
+            "                         p_bar_code,\n" +
+            "                         group_name,\n" +
+            "                         act_order_no,\n" +
+            "                         order_code,\n" +
+            "                         order_name,\n" +
+            "                         page_no,\n" +
+            "                         req_comment,\n" +
+            "                         req_doctor,\n" +
+            "                         req_dept,\n" +
+            "                         req_ward,\n" +
+            "                         exec_dept,\n" +
+            "                         req_date,\n" +
+            "                         inspect_part,\n" +
+            "                         inspect_stuff,\n" +
+            "                         sample_status,\n" +
+            "                         print_flag,\n" +
+            "                         receive_flag,\n" +
+            "                         req_type,\n" +
+            "                         result_comment,\n" +
+            "                         sys_date,\n" +
+            "                         start_time,\n" +
+            "                         isnull(diag_text, (select name from zd_icd_code_new where code = diag_code)) as diag_text,\n" +
+            "                         order_type,\n" +
+            "                         report_no,\n" +
+            "                         jz_flag,\n" +
+            "                         req_studyid,\n" +
+            "                         req_tz_comment,\n" +
+            "                         req_other_result,\n" +
+            "                         receive_jc,\n" +
+            "                         diag_code,\n" +
+            "                         confirm_flag,\n" +
+            "                         confirm_time,\n" +
+            "                         confirm_id,\n" +
+            "                         quantity,\n" +
+            "    inspect_stuff_name = (select rtrim(name) from jy_zd_sample with (NOLOCK) where code = inspect_stuff),\n" +
+            "    req_dept_name      = (select rtrim(name) from zd_unit_code where code = req_dept),\n" +
+            "    req_doctor_name    = (select rtrim(name) from a_employee_mi where code = req_doctor),\n" +
+            "                         case\n" +
+            "                             when req_type = '2' then (select rtrim(class)\n" +
+            "                                                       from jy_zd_item c\n" +
+            "                                                       where c.zy_order_code = order_code)\n" +
+            "                             else '00' end                                                               classes\n" +
+            "from ysh_yj_req with (NOLOCK)\n" +
             "where req_no = #{reqNo}")
     YshYjReq huoQuShengQingXiangQing(@Param("reqNo") Integer reqNo);
 

src/main/java/thyyxxk/webserver/service/jianyanjiekou/JianYanJieKouService.java

@@ -27,13 +27,14 @@ public class JianYanJieKouService {
         private String data;
     }
 
-    private final String API_IP = "http://172.16.32.178/apis";
-
     private Res postHttp(String url, JSONObject data) {
         try {
+            String API_IP = "http://172.16.32.178/apis";
             Res res = Forest.post(API_IP + url)
                     .addHeader("Content-Type", "application/json")
                     .addBody(data)
+                    .setRetryEnabled(false)
+                    .setConnectTimeout(5000)
                     .execute(Res.class);
             if (res == null) {
                 throw new BizException(ExceptionEnum.NETWORK_ERROR, "接口调用失败。");

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrControlRuleSever.java

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.config.exception.BizException;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.dao.his.zhuyuanyisheng.emr.EmrControlDao;