优化代码

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

@@ -147,9 +147,8 @@ public class JianYanJianChaController {
 
     @GetMapping("/queryCheckTextResults")
     public ResultVo<Map<String, Object>> queryCheckTextResults(@RequestParam("patNo") String patNo,
-                                                               @RequestParam("times") Integer times,
                                                                @RequestParam("reqNo") String reqNo) {
-        return server.queryCheckTextResults(patNo, times, reqNo);
+        return server.queryCheckTextResults(patNo,  reqNo);
     }
 
     @GetMapping("/getJyJcZdTree")

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

@@ -474,10 +474,13 @@ public interface JianYanJianChaDao {
             "from yj_jc_record where his_req_no = #{reqNo} and jc_id = #{jcId}")
     YjJcRecord getJcRecord(String reqNo, String jcId);
 
+    @Select("select text_zd,text_jc from " +
+            "yj_jc_record_report where report_no = #{report} and title_code = '01' ")
+    Map<String, String> selectTextJc(String report);
+
     @Select("select * from yj_jc_record_report WITH (NOLOCK) where report_no = #{reportNo};")
     YjJcRecordReport getJcRecordReportByReportNo(String reportNo);
 
-
     /**
      * 获取检验大类
      *

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/jianyanjiancha/YjJcRecord.java

@@ -196,6 +196,17 @@ public class YjJcRecord implements Serializable {
      */
     private String fsIcdText;
 
+
+    /**
+     * 诊断意见
+     */
+    private String diagnosticOpinion;
+
+    /**
+     * 检查所见
+     */
+    private String checkWhatYouSee;
+
     /**
      * changeIcdCode
      */

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/XinZhenYzActOrder.java

@@ -35,12 +35,6 @@ public class XinZhenYzActOrder {
      */
     private BigDecimal actOrderNo;
 
-    /**
-     * 上传给合理用药的id
-     */
-    private String rationalDrugUseId;
-
-
     /**
      * 费用的编码 药品或项目
      */

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

@@ -194,8 +194,8 @@ public class RationalUseServer {
         //  过敏节点，可循环
         sb.append("<allergic_data>");
 
-        List<XunHuanJieDian> guoMinShuZu = dao.guoMin(patNo);
-        xunHuanJieDian(sb, guoMinShuZu, "allergic");
+        List<XunHuanJieDian> allergyData = dao.guoMin(patNo);
+        xunHuanJieDian(sb, allergyData, "allergic");
         sb.append("</allergic_data>");
         // 皮试节点，可循环
         sb.append("<skintest_data>");
@@ -252,8 +252,6 @@ public class RationalUseServer {
                 yp = new YaoPin();
                 yp.setPackRetprice(BigDecimal.valueOf(1));
             }
-            item.setRationalDrugUseId(SnowFlakeId.instance().nextId());
-            // 因为我要入库才能生成医嘱号所以这里用雪花算法
             sb.append("<medicine>")
                     .append("<cf_id>").append("0").append("</cf_id>")
                     .append("<oeridid>").append(item.getActOrderNo().stripTrailingZeros().toPlainString()).append("</oeridid>")
@@ -286,6 +284,13 @@ public class RationalUseServer {
         return sb.toString();
     }
 
+    /**
+     * 循环节点
+     *
+     * @param sb      字符串
+     * @param jieDian 节点
+     * @param name    节点名称
+     */
     public void xunHuanJieDian(StringBuilder sb, List<XunHuanJieDian> jieDian, String name) {
         if (ListUtil.isBlank(jieDian)) {
             XunHuanJieDian zhenDuan = new XunHuanJieDian();

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

@@ -655,6 +655,12 @@ public class EmrServer {
      */
     public ResultVo<List<MedicalHistoryPrompts>> getEmrTipsData(String name, int typeCode) {
         QueryWrapper<?> qw = new QueryWrapper<>();
+        UserInfo us = redisLikeService.getUserInfoByToken();
+        if (typeCode == 1) {
+            qw.eq("creator_id", us.getCode());
+        } else if (typeCode == 2) {
+            qw.eq("dept", us.getDeptCode());
+        }
         qw.like("query_key", name)
                 .eq("type_code", typeCode)
                 .orderByDesc("count");

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

@@ -280,8 +280,10 @@ public class JianYanJianChaShenQingServer {
                 return shanChuMuBan(dao.muBanShuJu(param.getCode()));
             case "新增":
                 return xinZengShouMingMuBan(param);
+            default:
+                return ResultVoUtil.success();
         }
-        return ResultVoUtil.success();
+
     }
 
     /**
@@ -519,23 +521,36 @@ public class JianYanJianChaShenQingServer {
 
 
     public ResultVo<String> shanChuJianChaJianYan(Integer reqNo, String patNo, Integer times) {
+
         if (StringUtil.isBlank(patNo)) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "住院号不能为空。");
         }
+
         YshYjReq yj = dao.huoQuJianYanJianCha(reqNo, patNo, times);
         if (yj == null) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有查询到该数据的具体信息，已经被删除了。");
         }
+
+        String jcId = dao.getJcIdByPatNo(patNo);
+
+        if (StringUtil.notBlank(jcId)) {
+            YjJcRecord yjJcRecord = dao.getJcRecord(String.valueOf(reqNo), jcId);
+            if (yjJcRecord != null) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "结果已返回无法删除。");
+            }
+        }
+
         if (!"1".equals(yj.getReceiveFlag().trim())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "当前不是申请状态无法删除，无法删除。");
         }
+
         dao.shanChuJianYanJianCha(reqNo, patNo, times);
         dao.shanChuYiZhu(yj.getActOrderNo());
         log.info("删除医技申请==》操作人：{}，医技数据：{}", TokenUtil.getTokenUserId(), JSON.toJSONString(yj));
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
-    public ResultVo<Map<String, Object>> queryCheckTextResults(String patNo, Integer times, String reqNo) {
+    public ResultVo<Map<String, Object>> queryCheckTextResults(String patNo, String reqNo) {
         String jcId = dao.getJcIdByPatNo(patNo);
         if (StringUtil.isBlank(jcId)) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有获取到患者的检查id");
@@ -544,13 +559,12 @@ public class JianYanJianChaShenQingServer {
         if (yjJcRecord == null) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有查询到检查结果。");
         }
-        YjJcRecordReport report = dao.getJcRecordReportByReportNo(yjJcRecord.getReportNo());
-//        log.info("诊断意见：{}", JSON.toJSONString(yjJcRecord));
-//        log.info("检查所见：{}", JSON.toJSONString(report));
-//        log.info("住院号：{}，次数：{}，申请单号：{}", patNo, times, reqNo);
+        Map<String, String> textJc = dao.selectTextJc(yjJcRecord.getReportNo());
+
+        yjJcRecord.setDiagnosticOpinion(textJc.get("text_zd"));
+        yjJcRecord.setCheckWhatYouSee(textJc.get("text_jc"));
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
         map.put("record", yjJcRecord);
-        map.put("recordReport", report);
         return ResultVoUtil.success(map);
     }