项目录入护士退费问题

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

@@ -16,6 +16,7 @@ import thyyxxk.webserver.entity.projectEntry.DrugReturnForm;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -571,7 +572,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
                           @Param("infantFlag") int infantFlag);
 
     @Select("SELECT small_dept FROM zd_dept_all where dept = #{dept}")
-    List<String> chaXunZhiZXinKeShi(@Param("dept") String dept);
+    Set<String> chaXunZhiZXinKeShi(@Param("dept") String dept);
 
 
     @Select("select role_id from dj_user_role where  user_code = #{code}")

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

@@ -209,7 +209,15 @@ public class XiangMuLuRuService {
         // 获取原来的数据
         List<ZyDetailCharge> yuanTuiFeiList = dao.huoQuJuTiFeiYong(param.getInpatientNo(), param.getAdmissTimes(), ledgerSn, param.getList());
         // 获取患者自己的科室和下面的子科室
-        Set<String> deptList = publicServer.getChildDeptByUserCode();
+        Set<String> deptList = new HashSet<>();
+
+        UserInfo us = redisLikeService.getUserInfoByToken();
+        if (us.getDeptCode().startsWith("8")) {
+            deptList = dao.chaXunZhiZXinKeShi(param.getDeptCode());
+            deptList.add(userInfo.getDeptCode());
+        } else {
+            deptList = publicServer.getChildDeptByUserCode();
+        }
 
         List<ZyDetailCharge> project = new ArrayList<>();
         List<ZyDetailCharge> drug = new ArrayList<>();
@@ -288,10 +296,6 @@ public class XiangMuLuRuService {
             }
 
             ZyActpatient patientInfo = publicServer.huoQuHuanZheXinXi(param.getInpatientNo());
-//            // 药品单号
-//            Integer pageNo = publicServer.getTheDrugListNo();
-//            // 退药单汇总
-//            dao.drugReturnForm(pageNo, userInfo.getDeptCode(), TokenUtil.getTokenUserId(), param.getGroupNo());
             // 退药明细
             dao.detailsOfDrugReturnForm(drug, patientInfo.getInpatientNo(), patientInfo.getAdmissTimes(),
                     patientInfo.getName(), patientInfo.getBedNo(), userInfo.getDeptCode(), infantFlag,
@@ -818,6 +822,7 @@ public class XiangMuLuRuService {
         BigDecimal chargeAmountSum = new BigDecimal(0);
 
         List<Integer> yongHuJueSe = dao.huoQuJueSe(TokenUtil.getTokenUserId());
+
         List<String> zhiXinKeShi = dao.chaXunZhiZXinKeShi(zyDetailCharge.getDeptCode());
 
         for (ZyDetailCharge detailCharge : zhenShuShuJu) {