优化惠民活动功能

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -1796,13 +1796,19 @@ public class MzChargeDetailController {
      */
     @UserLoginToken
     @RequestMapping(value = "/getAmountForTempPrescription", method = {RequestMethod.POST})
-    public Map<String, Object> getAmountForTempPrescription(@RequestBody MzPrescriptionVo mzPrescriptionVo) {
+    public Map<String, Object> getAmountForTempPrescription(@RequestBody MzPrescriptionVo mzPrescriptionVo, HttpServletRequest httpServletRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
+            User tokenUser = TokenUtil.getUser(httpServletRequest);
+            mzPrescriptionVo.setDoctorCode(tokenUser.getUserIdCode());
             //计算金额不需要真实的科室信息
             mzPrescriptionVo.setJzFlag(YesNoEnum.NO.code);
-            mzPrescriptionVo.setDoctorCode(Constants.BRZZJF_CODE);
-            mzPrescriptionVo.setVisitDeptCode(Constants.ZZBM);
+            if(StringUtils.isBlank(mzPrescriptionVo.getVisitDeptCode())){
+                mzPrescriptionVo.setVisitDeptCode(Constants.ZZBM);
+            }
+            if(StringUtils.isBlank(mzPrescriptionVo.getDoctorCode())){
+                mzPrescriptionVo.setDoctorCode(Constants.BRZZJF_CODE);
+            }
             resultMap.put("code", 0);
             resultMap.put("data", mzChargeDetailService.getAmountForTempPrescription(mzPrescriptionVo));
             resultMap.put("message", "计算临时处方的中药，西药，诊疗以及总金额成功");

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -457,7 +457,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         }
         //計算第二部位和DR费用
         setSecondPartAndDrFeeForCharge(mzChargeDetails, mzYjReqMap, tcNoMap, reqAmountMap, zdChargeItemMap);
-        //预览的时候获取费用明细，需要打折，不是预览而是入库的时候不打折，因为入库后会有一次重新计算
+        //预览的时候获取费用明细，需要打折，不是预览而是入库的时候不打折，因为入库后会有一次重新计算 计算惠民活动
         formatPriceRoundDetail(mzChargeDetail, mzChargeDetails, mzPatientMi, mzChargeDetailList, maxOrderNo, itemNo, receiptNo, YesNoEnum.YES.equals(yesNo) ? true : false);
         //yes 预览需要将原数据库中已存在的明细与临时生成的一起返回
         if (YesNoEnum.YES.equals(yesNo)) {

src/main/resources/static/js/mz/clinic.js

@@ -8460,7 +8460,7 @@ function getParamsForpPrescription(type) {
     if (visitDeptCode == null) {
         visitDeptCode = "";
     }
-    jsonData.firstOrNot = visitDeptCode;
+    jsonData.visitDeptCode = visitDeptCode;
     jsonData.firstOrNot = $("input[name='firstOrNot']:checked").val();
     jsonData.icdCode = icdCode;
     jsonData.serialNo = $("#mzfzSerialNoInClick").val();