Pārlūkot izejas kodu

医保标志 等于2的不查看

xiaochan 4 gadi atpakaļ
vecāks
revīzija
98dc814082

+ 2 - 2
src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -82,7 +82,7 @@ public interface XiangMuLuRuDao {
 
             "        a.serial=c.serial and " +
             "        c.code= a.charge_code_mx and a.charge_code like 'BILL%' and " +
-            "        a.infant_flag = #{infantFlag} and d.code = a.op_id_code " +
+            "        a.infant_flag = #{infantFlag} and d.code = a.op_id_code and trans_flag_yb !=2 " +
             "union " +
             "SELECT a.admiss_times, " +
             "       a.inpatient_no, " +
@@ -135,7 +135,7 @@ public interface XiangMuLuRuDao {
             "</choose>" +
             "</if>" +
             "        a.charge_code not like 'BILL%' and " +
-            "        a.infant_flag = #{infantFlag} and c.code = a.op_id_code ) temp" +
+            "        a.infant_flag = #{infantFlag} and c.code = a.op_id_code and trans_flag_yb !=2 ) temp" +
             "</script>")
     List<ZyDetailCharge> getHuanZheFeiYong(@Param("inpatientNo") String inpatientNo,
                                            @Param("admissTimes") Integer admissTimes,

+ 8 - 7
src/main/java/thyyxxk/webserver/service/yibao/XiangMuLuRuService.java

@@ -53,9 +53,9 @@ public class XiangMuLuRuService {
         log.info("查询患者费用==》住院号{},住院次数:{},项目名称:{},录入日期:{},费用类型:{}", param.getInpatientNo(), param.getAdmissTimes(),
                 param.getChargeCode(), param.getStartTime(), param.getOrderNo());
         int infantFlag = 0;
+        // 如果是婴儿的话那么就需要截取 字符串了 在通过婴儿标识来判断
         if (param.getInpatientNo().contains("$")) {
-            String[] yingEr = param.getInpatientNo().split("\\$");
-            param.setInpatientNo(yingEr[0]);
+            param.setInpatientNo(param.getInpatientNo().split("\\$")[0]);
             infantFlag = 1;
         }
         List<ZyDetailCharge> list = dao.getHuanZheFeiYong(param.getInpatientNo(), param.getAdmissTimes(), param.getChargeCode(), infantFlag,
@@ -77,8 +77,10 @@ public class XiangMuLuRuService {
     }
 
     /**
+     * 搜索项目信息
+     *
      * @param pyCode 拼音码
-     * @return 获取项目code
+     * @return 返回项目信息
      */
     public ResultVo<List<GetDropdownBox>> getChargeCode(String pyCode) {
         return ResultVoUtil.success(dao.getChargeCode(StringUtil.isContainChinese(pyCode)));
@@ -96,6 +98,7 @@ public class XiangMuLuRuService {
         if (StringUtil.isBlank(param.getInpatientNo()) || param.getAdmissTimes() == null || param.getLedgerSn() == null || param.getList().size() == 0) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "患者信息不全");
         }
+        // 判断数据是否为 退费数据
         List<ZyDetailCharge> chaKanSFtuiFei = dao.chaKanSFYiJingTuiFeiLe(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn(), param.getList());
 
         for (ZyDetailCharge charge : chaKanSFtuiFei) {
@@ -103,8 +106,7 @@ public class XiangMuLuRuService {
         }
         // 判断是否为婴儿
         if (param.getInpatientNo().contains("$")) {
-            String[] yingEr = param.getInpatientNo().split("\\$");
-            param.setInpatientNo(yingEr[0]);
+            param.setInpatientNo(param.getInpatientNo().split("\\$")[0]);
         }
         // 获取到用户角色
         List<Integer> yongHuJueSe = dao.huoQuJueSe(TokenUtil.getTokenUserId());
@@ -212,8 +214,7 @@ public class XiangMuLuRuService {
         // 如果带有这个 $ 说明是婴儿
         if (param.getInpatientNo().contains("$")) {
             infantFlag = 1;
-            String[] yingEr = param.getInpatientNo().split("\\$");
-            param.setInpatientNo(yingEr[0]);
+            param.setInpatientNo(param.getInpatientNo().split("\\$")[0]);
         }
 
         // 获取最大流水号