|
@@ -879,13 +879,13 @@ public class MzPharmacyController {
|
|
|
String manufactoryName = ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode());
|
|
|
map.put("manufactoryName", manufactoryName);//生产厂家
|
|
|
String packUnitName = mzPharmacyService.getYpUnitName(ypZdDict.getPackUnit());
|
|
|
- if (groupNo.equals("81")) {
|
|
|
- map.put("ypUnitName", packUnitName);//单位
|
|
|
- map.put("drugUnitName", packUnitName);//一次剂量单位
|
|
|
- } else if (groupNo.equals("71")) {
|
|
|
+ if (groupNo.equals("71")) {
|
|
|
String drugUnitName = mzPharmacyService.getYpUnitName(chargeDetail.getDrugUnit());
|
|
|
map.put("ypUnitName", packUnitName);//单位
|
|
|
map.put("drugUnitName", drugUnitName);//一次剂量单位
|
|
|
+ } else {
|
|
|
+ map.put("ypUnitName", packUnitName);//单位
|
|
|
+ map.put("drugUnitName", packUnitName);//一次剂量单位
|
|
|
}
|
|
|
if(chargeDetail.getSupplyCode() != null){
|
|
|
MzZdSupplyType mzZdSupplyType = mzZdSupplyTypeService.selectMzZdSupplyTypeByCode(chargeDetail.getSupplyCode());
|