门诊收费日期转换报错处理，加强发药验证

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

@@ -470,12 +470,6 @@ public class MzPharmacyController {
                 resultMap.put("message", "次数不能为空");
                 return resultMap;
             }
-            int i = mzPharmacyService.queryConfirmFlagByRealNo(mzChargeDetail.getRealNo());
-            if(i == 3 || i == 4){
-                resultMap.put("code", -1);
-                resultMap.put("message", "发药失败，该处方已退药或已退费");
-                return resultMap;
-            }
             resultMap = mzPharmacyService.sendMedicineProcessing(mzChargeDetail, tokenUser);
             if(mzChargeDetail.getGroupNo().equals("71")){
                 dispensingSocketService.sendToMedicine(mzChargeDetail.getPatientId(),chargeDetailPharmacyVo.getWinNo());
@@ -508,7 +502,6 @@ public class MzPharmacyController {
             }
             for (int i = 0; i < chargeDetailPharmacyVos.size(); i++) {
                 MzChargeDetail mzChargeDetail = chargeDetailPharmacyVos.get(i).getMzChargeDetail();
-                mzChargeDetail.setGroupNo("71");
                 resultMap = mzPharmacyService.sendMedicineProcessing(mzChargeDetail, tokenUser);
                 dispensingSocketService.sendToMedicine(mzChargeDetail.getPatientId(),chargeDetailPharmacyVos.get(i).getWinNo());
             }

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPharmacyMapper.java

@@ -1010,6 +1010,6 @@ public interface MzPharmacyMapper {
      * @param realNo
      * @return
      */
-    @Select("select top 1 confirm_flag from mz_charge_detail where real_no=${realNo}")
-    int selectConfirmFlagByRealNo(@Param("realNo") Integer realNo);
+    @Select("select top 1 confirm_flag from mz_charge_detail where real_no=${realNo} and group_no=#{groupNo} and order_no=#{orderNo}")
+    int selectConfirmFlagByRealNo(@Param("realNo") Integer realNo, @Param("groupNo") String groupNo, @Param("orderNo") Integer orderNo);
 }

src/main/java/cn/hnthyy/thmz/service/his/mz/MzPharmacyService.java

@@ -189,7 +189,9 @@ public interface MzPharmacyService {
      * 查询处方状态
      *
      * @param realNo
+     * @param groupNo
+     * @param orderNo
      * @return
      */
-    int queryConfirmFlagByRealNo(Integer realNo);
+    int queryConfirmFlagByRealNo(Integer realNo, String groupNo, Integer orderNo);
 }

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

@@ -172,6 +172,10 @@ public class MzPharmacyServiceImpl implements MzPharmacyService {
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT, timeout = 36000, rollbackFor = Exception.class)
     public Map<String, Object> sendMedicineProcessing(MzChargeDetail mzChargeDetail, User user) throws MzException {
         Map<String, Object> resultMap = new HashMap<>();
+        int i = mzPharmacyMapper.selectConfirmFlagByRealNo(mzChargeDetail.getRealNo(),mzChargeDetail.getGroupNo(),mzChargeDetail.getOrderNo());
+        if(i != 0){
+            throw new MzException("发药失败，流水号"+mzChargeDetail.getRealNo()+"处方非待发药状态(已发药、退药或已退费)");
+        }
         Date date = new Date();
         List<MzSendMedicineVo> cfxxList = mzPharmacyMapper.selectFyclPrescriptionDetail(mzChargeDetail);
         List<YpMzFytj> ypMzFytjs = new ArrayList();
@@ -347,8 +351,8 @@ public class MzPharmacyServiceImpl implements MzPharmacyService {
     }
 
     @Override
-    public int queryConfirmFlagByRealNo(Integer realNo) {
-        return mzPharmacyMapper.selectConfirmFlagByRealNo(realNo);
+    public int queryConfirmFlagByRealNo(Integer realNo, String groupNo, Integer orderNo) {
+        return mzPharmacyMapper.selectConfirmFlagByRealNo(realNo, groupNo, orderNo);
     }
 
     @Override

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

@@ -51,6 +51,8 @@ $(function () {
         var tem = [];
         for (let i = 0; i < rows.length; i++) {
             let item = rows[i];
+            item.groupNo = groupNo;
+            item.chargeDate = null;//后台转换异常，临时赋空
             tem.push({
                 mzChargeDetail: item,
                 winNo: winNo
@@ -439,7 +441,6 @@ function initTbTable(pageIndex) {
             }
             var ress = eval(res);
             let reverse = getLineUpData(ress.data);
-            console.log(reverse);
             $('#tb_table').bootstrapTable('load', reverse);
             if (ress.code == -1) {
                 if (ress.message != null && ress.message != '') {