|  | @@ -630,7 +630,7 @@ public class MzPharmacyController {
 | 
	
		
			
				|  |  |                  map.put("drugFlag", ypZdDict.getDrugFlag());//毒麻标志
 | 
	
		
			
				|  |  |                  map.put("psFlag", ypZdDict.getPsFlag());//是否需要皮试
 | 
	
		
			
				|  |  |                  YpBaseYf ypBaseYf = ypBaseYfService.queryYpBaseYf(chargeDetail.getChargeItemCode(), chargeDetail.getSerial(), chargeDetail.getGroupNo());
 | 
	
		
			
				|  |  | -                map.put("location",ypBaseYf.getLocation());
 | 
	
		
			
				|  |  | +                map.put("location",ypBaseYf.getLocation()==null?"":ypBaseYf.getLocation());
 | 
	
		
			
				|  |  |                  map.put("stockAmount",ypBaseYf.getStockAmount());
 | 
	
		
			
				|  |  |                  String manufactoryName = ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode());
 | 
	
		
			
				|  |  |                  map.put("manufactoryName", manufactoryName);//生产厂家
 | 
	
	
		
			
				|  | @@ -1084,4 +1084,31 @@ public class MzPharmacyController {
 | 
	
		
			
				|  |  |              return resultMap;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    /**
 | 
	
		
			
				|  |  | +     * 查询处方打印状态
 | 
	
		
			
				|  |  | +     * @param patientId
 | 
	
		
			
				|  |  | +     * @param times
 | 
	
		
			
				|  |  | +     * @param orderNo
 | 
	
		
			
				|  |  | +     * @return
 | 
	
		
			
				|  |  | +     */
 | 
	
		
			
				|  |  | +    @UserLoginToken
 | 
	
		
			
				|  |  | +    @RequestMapping(value = "/getPrintFlag",method = RequestMethod.GET)
 | 
	
		
			
				|  |  | +    public Map<String,Object> getPrintFlag(@RequestParam("patientId") String patientId,@RequestParam("times") String times
 | 
	
		
			
				|  |  | +            ,@RequestParam("orderNo") String orderNo){
 | 
	
		
			
				|  |  | +        Map<String, Object> resultMap = new HashMap<>();
 | 
	
		
			
				|  |  | +        try {
 | 
	
		
			
				|  |  | +            int printFlag = mzChargeDetailService.queryPrintFlag(patientId, times, orderNo);
 | 
	
		
			
				|  |  | +            resultMap.put("code", 0);
 | 
	
		
			
				|  |  | +            resultMap.put("message", "查询处方打印状态成功");
 | 
	
		
			
				|  |  | +            resultMap.put("printFlag", printFlag);
 | 
	
		
			
				|  |  | +            return resultMap;
 | 
	
		
			
				|  |  | +        } catch (Exception e) {
 | 
	
		
			
				|  |  | +            e.printStackTrace();
 | 
	
		
			
				|  |  | +            log.error("查询处方打印状态失败,错误信息{}", e);
 | 
	
		
			
				|  |  | +            resultMap.put("code", -1);
 | 
	
		
			
				|  |  | +            resultMap.put("message", "查询处方打印状态失败");
 | 
	
		
			
				|  |  | +            return resultMap;
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |  }
 |