Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

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

@@ -801,7 +801,7 @@ public class MzPharmacyController {
                             map.put("cyFysm",zdCommon.getName());
                         }
                     }
-                    totalPrice = totalPrice.add(chargeDetail.getUnitPrice().multiply(BigDecimal.valueOf(chargeDetail.getQuantity())));
+                    totalPrice = totalPrice.add(chargeDetail.getUnitPrice().multiply(BigDecimal.valueOf(chargeDetail.getQuantity()*chargeDetail.getDrugWin())));
                     map.put("quantity", chargeDetail.getQuantity());//数量
                     map.put("paySelf", chargeDetail.getPaySelf());//自备药
                     map.put("drugQuan", chargeDetail.getDrugQuan());//一次剂量

src/main/java/cn/hnthyy/thmz/mapper/his/yz/YzYpZyOrderMapper.java

@@ -147,8 +147,7 @@ public interface YzYpZyOrderMapper {
                     " FROM  yz_yp_zy_order a  WITH(NOLOCK)" +
                     " where a.page_no_ty =#{pageNoTy}  and " +
                     "       a.status_flag in (${submitFlag}) and " +
-                    "       a.amount < 0 and " +
-                    "       a.drug_class<>'d' " +
+                    "       a.amount < 0 " +
                     " group by a.charge_code,a.serial" +
                     " order by charge_code,serial"
             })
@@ -191,8 +190,7 @@ public interface YzYpZyOrderMapper {
                     "    FROM yz_yp_zy_order a WITH(NOLOCK)" +
                     "where    a.page_no_ty =#{pageNoTy}  and " +
                     "         a.status_flag in (${submitFlag}) and " +
-                    "         a.amount < 0 and " +
-                    "         a.drug_class<>'d' " +
+                    "         a.amount < 0 " +
                     "order by a.inpatient_no,a.admiss_times,a.charge_code,a.occ_time "
             })
     List<YzYpZyOrder> selectYzYpOrderTyDetail(@Param("pageNoTy") String pageNoTy, @Param("submitFlag") String submitFlag);

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -925,7 +925,9 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             }
         }
         if (yzYpZyOrderMapper.updateStatusFlag(y) == 0) {
-            throw new MzException("保存住院病人发药记录失败，修改医嘱药品发药状态异常");
+            log.info("撤销了一张空单{}", JSONObject.valueToString(y));
+        }else{
+            log.info("撤销药单，修改药单明细状态成功{}", JSONObject.valueToString(y));
         }
         return yzYpPageNoMapper.updateSubmitCancelFlag(pageNo, userIdCode);
     }

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

@@ -1336,7 +1336,7 @@ function prescriptionDetail(realNo, orderNo, receiptNo, times, patientId, confir
         onLoadSuccess: function (res) {  //加载成功时执行
             var sendTotalAmount = 0;
             for (var i = 0; i < res.rows.length; i++) {
-                sendTotalAmount += parseFloat(res.rows[i].quantity * res.rows[i].unitPrice);
+                sendTotalAmount += parseFloat(res.rows[i].quantity * res.rows[i].unitPrice * res.rows[i].drugWin);
             }
             $('#sendTotalAmount').html(sendTotalAmount.toFixed(2));//toFixed(2),保留2位小数,避免js中小数相加小数点后面多出很多位
         },

src/main/resources/static/js/yf/ward_prescription.js

@@ -1053,8 +1053,8 @@ function queryParams(params) {
     var rePortRangeArr = getRePortRangeArr();
     let wardCode = ($("#wardCode").val() == null ? null : $("#wardCode").val()[0]);
     var temp = {
-        submitBeginDate: rePortRangeArr[0],
-        submitEndDate: rePortRangeArr[1],
+        submitBeginDate: isEmpty($("#pageNoSearch").val())?rePortRangeArr[0]:null,
+        submitEndDate: isEmpty($("#pageNoSearch").val())?rePortRangeArr[1]:null,
         wardCode: wardCode,
         pageNo: $("#pageNoSearch").val() == "" ? null : $("#pageNoSearch").val(),
         groupNo: groupNo,