|  | @@ -10,10 +10,10 @@ import thyyxxk.webserver.constants.Capacity;
 | 
	
		
			
				|  |  |  import thyyxxk.webserver.constants.GetDateFormat;
 | 
	
		
			
				|  |  |  import thyyxxk.webserver.dao.his.yibao.TransferInOfExpensesDao;
 | 
	
		
			
				|  |  |  import thyyxxk.webserver.entity.ResultVo;
 | 
	
		
			
				|  |  | +import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 | 
	
		
			
				|  |  |  import thyyxxk.webserver.entity.datamodify.MzChargeDetail;
 | 
	
		
			
				|  |  |  import thyyxxk.webserver.entity.datamodify.ZyDetailCharge;
 | 
	
		
			
				|  |  |  import thyyxxk.webserver.entity.yibao.ZyActpatient;
 | 
	
		
			
				|  |  | -import thyyxxk.webserver.service.makedbzfees.MakeDbzFeesService;
 | 
	
		
			
				|  |  |  import thyyxxk.webserver.utils.ResultVoUtil;
 | 
	
		
			
				|  |  |  import thyyxxk.webserver.utils.TokenUtil;
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -34,11 +34,9 @@ import java.util.Map;
 | 
	
		
			
				|  |  |  public class TransferInOfExpensesService {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      private final TransferInOfExpensesDao dao;
 | 
	
		
			
				|  |  | -    private final MakeDbzFeesService makeDbzFeesService;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    public TransferInOfExpensesService(TransferInOfExpensesDao dao, MakeDbzFeesService makeDbzFeesService) {
 | 
	
		
			
				|  |  | +    public TransferInOfExpensesService(TransferInOfExpensesDao dao) {
 | 
	
		
			
				|  |  |          this.dao = dao;
 | 
	
		
			
				|  |  | -        this.makeDbzFeesService = makeDbzFeesService;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /**
 | 
	
	
		
			
				|  | @@ -89,6 +87,8 @@ public class TransferInOfExpensesService {
 | 
	
		
			
				|  |  |      public ResultVo<Map<String, Object>> getZyJiMenZhenZhuangRuFeiYong(String inpatientNo, String chargeCodeMX, long currentPage, long pageSize) {
 | 
	
		
			
				|  |  |          log.info("查看患者是通过门急诊转入的费用项目 --> 住院号:{},收费编码:{},当前页:{},页数:{}", inpatientNo, chargeCodeMX, currentPage, pageSize);
 | 
	
		
			
				|  |  |          IPage<ZyDetailCharge> page = new Page<>(currentPage, pageSize);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          List<ZyDetailCharge> list = dao.getZyJiMenZhenZhuangRuFeiYong(page, inpatientNo, chargeCodeMX);
 | 
	
		
			
				|  |  |          Map<String, Object> map = new HashMap<>(Capacity.TWO);
 | 
	
		
			
				|  |  |          if (page.getTotal() > 0 || list.size() > 0) {
 | 
	
	
		
			
				|  | @@ -133,4 +133,15 @@ public class TransferInOfExpensesService {
 | 
	
		
			
				|  |  |          log.info("急门诊费用插入数据:{}", JSON.toJSONStringWithDateFormat(param, GetDateFormat.DATE_TIME));
 | 
	
		
			
				|  |  |          return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "添加成功");
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    /**
 | 
	
		
			
				|  |  | +     * 远程搜索 项目名称
 | 
	
		
			
				|  |  | +     *
 | 
	
		
			
				|  |  | +     * @param pyCode 拼音码 大写的
 | 
	
		
			
				|  |  | +     * @return 返回多个项目的名称
 | 
	
		
			
				|  |  | +     */
 | 
	
		
			
				|  |  | +    public ResultVo<List<GetDropdownBox>> queryEntryName(String pyCode) {
 | 
	
		
			
				|  |  | +        IPage<GetDropdownBox> page = new Page<>(1, 20);
 | 
	
		
			
				|  |  | +        return ResultVoUtil.success(dao.queryEntryName(page, pyCode.toUpperCase() + "%"));
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |  }
 |