|
@@ -7,6 +7,7 @@ import cn.hnthyy.thmz.entity.MzException;
|
|
|
import cn.hnthyy.thmz.entity.his.mz.*;
|
|
|
import cn.hnthyy.thmz.entity.his.yp.YpBaseYf;
|
|
|
import cn.hnthyy.thmz.entity.his.yp.YpZdDict;
|
|
|
+import cn.hnthyy.thmz.entity.his.zd.ZdCommon;
|
|
|
import cn.hnthyy.thmz.entity.his.zd.ZdUnitCode;
|
|
|
import cn.hnthyy.thmz.entity.thmz.DispensingWindows;
|
|
|
import cn.hnthyy.thmz.entity.thmz.RadSendRecord;
|
|
@@ -17,6 +18,7 @@ import cn.hnthyy.thmz.service.his.mz.*;
|
|
|
import cn.hnthyy.thmz.service.his.yp.YpBaseYfService;
|
|
|
import cn.hnthyy.thmz.service.his.yp.YpZdDictService;
|
|
|
import cn.hnthyy.thmz.service.his.yp.YpZdManufactoryService;
|
|
|
+import cn.hnthyy.thmz.service.his.zd.MzYshZdFysmService;
|
|
|
import cn.hnthyy.thmz.service.his.zd.ZdUnitCodeService;
|
|
|
import cn.hnthyy.thmz.service.thmz.DispensingSocketService;
|
|
|
import cn.hnthyy.thmz.service.thmz.DispensingWindowsService;
|
|
@@ -65,6 +67,8 @@ public class MzPharmacyController {
|
|
|
private YpBaseYfService ypBaseYfService;
|
|
|
@Autowired
|
|
|
private MzBlRecordService mzBlRecordService;
|
|
|
+ @Autowired
|
|
|
+ private MzYshZdFysmService mzYshZdFysmService;
|
|
|
/**
|
|
|
* 查询处方信息
|
|
|
*
|
|
@@ -629,12 +633,24 @@ public class MzPharmacyController {
|
|
|
BigDecimal totalPrice = new BigDecimal("0");//总价
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
for (int i = 0; i < mzChargeDetails.size(); i++) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
MzChargeDetail chargeDetail = mzChargeDetails.get(i);
|
|
|
if(i == 0){
|
|
|
String warnDeptName = zdUnitCodeService.queryDeptNameByIdInCache(chargeDetail.getWarnDept());
|
|
|
printMap.put("warnDeptName", warnDeptName);//科室
|
|
|
+ if(StringUtils.isNotBlank(chargeDetail.getCyDj())){
|
|
|
+ MzZdSupplyType mzZdSupplyType = mzZdSupplyTypeService.selectMzZdSupplyTypeByCode(chargeDetail.getCyDj());
|
|
|
+ if(null != mzZdSupplyType){
|
|
|
+ map.put("cyDj",mzZdSupplyType.getPrintName());
|
|
|
+ }else{
|
|
|
+ map.put("cyDj",chargeDetail.getCyDj());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(null != chargeDetail.getCyFysm()){
|
|
|
+ ZdCommon zdCommon = mzYshZdFysmService.queryMzYshZdFysmByCode(chargeDetail.getCyFysm());
|
|
|
+ map.put("cyFysm",zdCommon.getName());
|
|
|
+ }
|
|
|
}
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
totalPrice = totalPrice.add(chargeDetail.getUnitPrice().multiply(BigDecimal.valueOf(chargeDetail.getQuantity())));
|
|
|
map.put("quantity", chargeDetail.getQuantity());//数量
|
|
|
map.put("drugQuan", chargeDetail.getDrugQuan());//一次剂量
|
|
@@ -644,6 +660,13 @@ public class MzPharmacyController {
|
|
|
map.put("instructionText", chargeDetail.getInstructionText());//嘱托说明
|
|
|
map.put("tryResult", chargeDetail.getTryResult());//皮试结果
|
|
|
map.put("tryFlag", chargeDetail.getTryFlag());//是否需要皮试
|
|
|
+ map.put("drugWin", chargeDetail.getDrugWin());
|
|
|
+ map.put("cyMtjs", chargeDetail.getCyMtjs());
|
|
|
+ map.put("cyJsl", chargeDetail.getCyJsl());
|
|
|
+ map.put("cyZql", chargeDetail.getCyZql());
|
|
|
+ map.put("cyFj", chargeDetail.getCyFj());
|
|
|
+ map.put("cyFfcs", chargeDetail.getCyFfcs());
|
|
|
+ map.put("cyJssm", chargeDetail.getCyJssm());
|
|
|
YpZdDict ypZdDict = ypZdDictService.queryYpZdDictByCodeAndSerial(chargeDetail.getChargeItemCode(), chargeDetail.getSerial());
|
|
|
map.put("ybZfFlag",chargeDetail.getYbZfFlag());//皮试自备
|
|
|
map.put("drugName", ypZdDict.getName());//药品名称
|
|
@@ -731,12 +754,24 @@ public class MzPharmacyController {
|
|
|
BigDecimal totalPrice = new BigDecimal("0");//总价
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
for (int i = 0; i < mzChargeDetails.size(); i++) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
MzChargeDetail chargeDetail = mzChargeDetails.get(i);
|
|
|
if(i == 0){
|
|
|
String warnDeptName = zdUnitCodeService.queryDeptNameByIdInCache(chargeDetail.getWarnDept());
|
|
|
printMap.put("warnDeptName", warnDeptName);//科室
|
|
|
+ if(StringUtils.isNotBlank(chargeDetail.getCyDj())){
|
|
|
+ MzZdSupplyType mzZdSupplyType = mzZdSupplyTypeService.selectMzZdSupplyTypeByCode(chargeDetail.getCyDj());
|
|
|
+ if(null != mzZdSupplyType){
|
|
|
+ map.put("cyDj",mzZdSupplyType.getPrintName());
|
|
|
+ }else{
|
|
|
+ map.put("cyDj",chargeDetail.getCyDj());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(null != chargeDetail.getCyFysm()){
|
|
|
+ ZdCommon zdCommon = mzYshZdFysmService.queryMzYshZdFysmByCode(chargeDetail.getCyFysm());
|
|
|
+ map.put("cyFysm",zdCommon.getName());
|
|
|
+ }
|
|
|
}
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
totalPrice = totalPrice.add(chargeDetail.getUnitPrice().multiply(BigDecimal.valueOf(chargeDetail.getQuantity())));
|
|
|
map.put("quantity", chargeDetail.getQuantity());//数量
|
|
|
map.put("drugQuan", chargeDetail.getDrugQuan());//一次剂量
|
|
@@ -746,6 +781,13 @@ public class MzPharmacyController {
|
|
|
map.put("instructionText", chargeDetail.getInstructionText());//嘱托说明
|
|
|
map.put("tryResult", chargeDetail.getTryResult());//皮试结果
|
|
|
map.put("tryFlag", chargeDetail.getTryFlag());//是否需要皮试
|
|
|
+ map.put("drugWin", chargeDetail.getDrugWin());
|
|
|
+ map.put("cyMtjs", chargeDetail.getCyMtjs());
|
|
|
+ map.put("cyJsl", chargeDetail.getCyJsl());
|
|
|
+ map.put("cyZql", chargeDetail.getCyZql());
|
|
|
+ map.put("cyFj", chargeDetail.getCyFj());
|
|
|
+ map.put("cyFfcs", chargeDetail.getCyFfcs());
|
|
|
+ map.put("cyJssm", chargeDetail.getCyJssm());
|
|
|
YpZdDict ypZdDict = ypZdDictService.queryYpZdDictByCodeAndSerial(chargeDetail.getChargeItemCode(), chargeDetail.getSerial());
|
|
|
map.put("ybZfFlag",chargeDetail.getYbZfFlag());//皮试自备
|
|
|
map.put("drugName", ypZdDict.getName());//药品名称
|