xiaochan 1 anno fa
parent
commit
0830d67d22

+ 1 - 1
pom.xml

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

+ 10 - 0
src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/JianYanJianChaController.java

@@ -48,6 +48,7 @@ public class JianYanJianChaController {
     public ResultVo<Map<String, Object>> huoQuShengQingXiangQing(@RequestParam("reqNo") Integer reqNo) {
         return server.huoQuShengQingXiangQing(reqNo);
     }
+
     @GetMapping("/getTemplateGrouping")
     public ResultVo<List<JcZdClass>> getTemplateGrouping(@RequestParam("itemType") Integer itemType,
                                                          @RequestParam("templateType") Integer templateType) {
@@ -173,5 +174,14 @@ public class JianYanJianChaController {
         return server.checkTheCallbacks(param);
     }
 
+    @GetMapping("/getJcIdByPatNo")
+    public ResultVo<List<String>> getJcIdByPatNo(@RequestParam("patNo") String patNo) {
+        return server.getJcIdByPatNo(patNo);
+    }
+
+    @GetMapping("/getExamineDetail")
+    public ResultVo<List<JianChaJieGuo>> getExamineDetail(@RequestParam("jcId") String jcId) {
+        return server.getExamineDetail(jcId);
+    }
 
 }

+ 15 - 1
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -533,8 +533,22 @@ public interface JianYanJianChaDao {
     YshYjReq getAncillaryInformation(@Param("patNo") String patNo,
                                      @Param("times") Integer times);
 
-
     @Update("update ysh_yj_req set patient_uid = #{uid} where req_no = #{reqNo}")
     void setCheckPatientUid(String uid, Integer reqNo);
 
+    @Select("select jc_id from yj_jc_patient where ba_no = #{patNo}")
+    List<String> getJcIdByPatNoList(String patNo);
+
+    @Select("select apply_date,\n" +
+            "       apply_doctor_name = (select rtrim(name) from a_employee_mi where code = apply_doctor),\n" +
+            "       orderName         = (select rtrim(name) from jc_zd_item where zy_order_code = order_code),\n" +
+            "       text_zd,\n" +
+            "       text_jc  " +
+            "from yj_jc_record a,\n" +
+            "     yj_jc_record_report b\n" +
+            "where a.jc_id = #{jcId}" +
+            "  and a.report_no = b.report_no\n" +
+            "  and b.title_code = '01' " +
+            " order by apply_date desc")
+    List<JianChaJieGuo> selectJieGuo(String jcId);
 }

+ 15 - 0
src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/jianyanjiancha/JianChaJieGuo.java

@@ -0,0 +1,15 @@
+package thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha;
+
+import lombok.Data;
+
+import java.sql.Blob;
+import java.util.Date;
+
+@Data
+public class JianChaJieGuo {
+    private Date applyDate;
+    private String applyDoctorName;
+    private String orderName;
+    private String textZd;
+    private String textJc;
+}

+ 12 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingService.java

@@ -27,9 +27,11 @@ import thyyxxk.webserver.service.externalhttp.WebSocketService;
 import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.*;
 
+import java.io.ByteArrayInputStream;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.security.cert.TrustAnchor;
+import java.sql.Blob;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -694,7 +696,6 @@ public class JianYanJianChaShenQingService {
      */
     public ResultVo<String> checkTheCallbacks(CheckTheCallbacks param) {
         QueryWrapper<CheckTheCallbacks> queryWrapper = new QueryWrapper<>();
-
         queryWrapper.eq("patient_uid", param.getPatientUid())
                 .eq("patient_from", param.getPatientFrom());
 
@@ -732,6 +733,16 @@ public class JianYanJianChaShenQingService {
         return ResultVoUtil.success(exist ? "更新成功。" : "回传成功。");
     }
 
+    public ResultVo<List<String>> getJcIdByPatNo(String patNo) {
+        return ResultVoUtil.success(dao.getJcIdByPatNoList(patNo));
+    }
+
+    public ResultVo<List<JianChaJieGuo>> getExamineDetail(String jcId) {
+        List<JianChaJieGuo> res = dao.selectJieGuo(jcId);
+        return ResultVoUtil.success(res);
+    }
+
+
 
 }