完成住院医生提示

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -630,9 +630,9 @@ public interface UpIdCollectionDao {
 
     @Select("select pat_no, times, ledger_sn " +
             "from t_si_setlinfo " +
-            "where  nullif(setl_list_id,'') is null " +
+            "where nullif(setl_list_id,'') is null " +
             "  and revoked = 0 " +
-            "  and CONVERT(varchar(100), GETDATE(), 23) = CONVERT(varchar(100), setl_time, 23)")
+            "  and CONVERT(varchar(7), GETDATE(), 23) = CONVERT(varchar(7), setl_time, 23)")
     List<SiSetlinfoTemp> getBillingPatientsToday();
 
 

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

@@ -219,10 +219,13 @@ public class YiZhuLuRuServer {
             List<XinZhenYzActOrder> xiangMu = dao.huoQuXiangMu(code);
             for (XinZhenYzActOrder item : xiangMu) {
                 if (item.getDelFlag() == 1) {
-                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "该医嘱下的项目，已经被停用了，请联系物价科。");
+                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("该医嘱下的【%s】，已经被停用了，请联系物价科。", item.getOrderName()));
                 } else if (StringUtil.isBlank(item.getNationalCode())) {
                     prompt.add(String.format("该医嘱下面的【%s】，没有医保编码，请注意。", item.getOrderName()));
+                } else {
+                    prompt.add(String.format("该医嘱下【%s】，医保码为：【%s】。", item.getOrderName(), item.getNationalCode()));
                 }
+
             }
             if (ListUtil.isBlank(xiangMu)) {
                 Integer paiChiYiZhu = dao.shiFouPaiChiYiZhu(code);
@@ -247,8 +250,6 @@ public class YiZhuLuRuServer {
                     return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "该药品禁止在患者所在的科室使用。");
                 }
             }
-            // 01224
-
             if (yp == null) {
                 return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "该医嘱下的药品，可能已经被停用了，请联系药剂科。");
             }
@@ -280,6 +281,8 @@ public class YiZhuLuRuServer {
             }
             if (StringUtil.isBlank(yp.getNationalCode())) {
                 prompt.add("该药品医保没有匹配医保码");
+            } else {
+                prompt.add(String.format("药品医保码为：【%s】", yp.getNationalCode()));
             }
             if (yp.getStockAmount() != null && BigUtils.bigXiaoYu(yp.getStockAmount(), 10)) {
                 prompt.add(String.format("该药品剩余数量为:【%s】", yp.getStockAmount().stripTrailingZeros().toPlainString()));
@@ -325,6 +328,7 @@ public class YiZhuLuRuServer {
     public ResultVo<List<GetDropdownBox>> huoQuZhiXinKeShi(String code) {
         return ResultVoUtil.success(dao.huoQuZhiXinKeShi(StringUtil.isContainChinese(code)));
     }
+
     public ResultVo<Map<String, Object>> singleDataCheck(XinZhenYiZhu param) {
         //  获取医生开药品的权限
         Integer 医生级别 = dao.huoQuYiShenDengJi(TokenUtil.getTokenUserId());
@@ -395,9 +399,6 @@ public class YiZhuLuRuServer {
             错误信息.put("data", item);
             WebSocketServer.sendMessage(sid, SocketMsg.socketVo(Message.UPDATED_ORDER, map));
         }
-        if (true) {
-            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "测试不开医嘱。");
-        }
 
         if (isThereAnyErrorMessage) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "请修改错误的医嘱");
@@ -759,6 +760,12 @@ public class YiZhuLuRuServer {
         return a + b;
     }
 
+    /**
+     * 获取模板数据
+     *
+     * @param code 模板的编码
+     * @return 返回数据
+     */
     public ResultVo<List<YzActOrder>> huoQuMuBanShuJu(String code) {
         List<YzActOrder> muBanShuJu = dao.huoQuMuBanShuJu(code);
         Map<BigDecimal, YzActOrder> map = new HashMap<>(muBanShuJu.size());
@@ -773,7 +780,7 @@ public class YiZhuLuRuServer {
         for (YzActOrder item : muBanShuJu) {
             YzActOrder yzActOrder = map.get(item.getParentNo());
             if (yzActOrder != null) {
-
+                item.setParentNo(new BigDecimal(yzActOrder.getId()));
                 item.setIsChildren(true);
                 if (yzActOrder.getChildren() == null) {
                     yzActOrder.setChildren(new ArrayList<>());