Explorar o código

护士退药单,只查询自己的科室

xiaochan hai 2 meses
pai
achega
49de104802

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/inpatient/xmlr/XiangMuLuRuDao.java

@@ -765,7 +765,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "from yz_yp_zy_order a," +
             "yp_zd_dict b " +
             "where page_no_ty = -1 " +
-            "  and dept_code IN ${dept}" +
+            "  and dept_code = '${dept}' " +
             "  and group_no = #{groupNo} " +
             "  and page_class = 'HT' " +
             "  AND charge_date >= #{start} AND charge_date <= #{end}" +

+ 3 - 4
src/main/java/thyyxxk/webserver/service/inpatient/xmlr/XiangMuLuRuService.java

@@ -509,7 +509,7 @@ public class XiangMuLuRuService {
         }
         Integer ledgerSn = publicServer.getLedgerSn(param.getInpatientNo(), param.getAdmissTimes());
         // 在此处 插入费用
-        dao.chaRuFeiYong(param, param.getList(),
+        dao. chaRuFeiYong(param, param.getList(),
                 infantFlag,
                 ledgerSn,
                 DateUtil.formatDatetime(param.getChargeDate(),
@@ -865,14 +865,13 @@ public class XiangMuLuRuService {
     }
 
     public ResultVo<List<DrugReturnForm>> getNoMedicineReturnOrderGenerated(String startDate, String endDate, String groupNo) {
-        Set<String> deptList = publicServer.getUserDeptList();
-
+        UserInfo userInfo = userCache.getUserInfoByToken();
         return ResultVoUtil.success(
                 groupingValues(
                         dao.selectNoMedicineReturnOrderGenerated(
                                 startDate,
                                 endDate,
-                                PublicServer.listToSqlIn(deptList),
+                                userInfo.getDeptCode(),
                                 groupNo),
                         null));
     }