项目录入

src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -21,7 +21,6 @@ public interface XiangMuLuRuDao {
     /**
      * 获取患者的费用
      *
-     * @param page        分页
      * @param inpatientNo 住院号
      * @param admissTimes 住院次数
      * @param ledgerSn    结算次数
@@ -118,7 +117,9 @@ public interface XiangMuLuRuDao {
      * @param pyCode 拼音编码
      * @return 获取项目的名称和code
      */
-    @Select("select code,name from  zd_charge_item where (py_code like #{pyCode} or code like #{pyCode} or name like #{pyCode})")
+    @Select("select code,name from  zd_charge_item where (py_code like #{pyCode} or code like #{pyCode} or name like #{pyCode})" +
+            "union all " +
+            "select code,name from  yp_zd_dict where (py_code like #{pyCode} or code like #{pyCode} or name like #{pyCode})")
     List<GetDropdownBox> getChargeCode(String pyCode);
 
     /**

src/main/java/thyyxxk/webserver/service/yibao/XiangMuLuRuService.java

@@ -44,7 +44,7 @@ public class XiangMuLuRuService {
     }
 
     /**
-     * 分页获取患者费用
+     * 获取患者费用
      *
      * @param param 查询条件
      * @return 返回患者费用
@@ -106,10 +106,9 @@ public class XiangMuLuRuService {
             if (pojo.getChargeFee().signum() == -1 || pojo.getChargeAmount().signum() == -1) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "患者费用存在负数，该数据为退费数据");
             }
-
-            if (!param.getDeptCode().equals(pojo.getDeptCode())) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请录入的科室进行退费", pojo.getDetailSn()));
-            }
+//            if (!param.getDeptCode().equals(pojo.getDeptCode())) {
+//                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请录入的科室进行退费", pojo.getDetailSn()));
+//            }
             sum = sum.add(pojo.getChargeFee().multiply(pojo.getChargeAmount()));
             pojo.setChargeFee(pojo.getChargeFee().negate());
             pojo.setChargeAmount(pojo.getChargeAmount().negate());

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: his
+      primary: dev
       strict: false
       datasource:
         his: