处方优化

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

@@ -225,7 +225,7 @@ public interface MzBlRecordMapper {
      *
      * @return
      */
-    @Select("select top 1  emr_no from  mz_bl_record order by emr_no desc")
+    @Select("select top 1  emr_no from  mz_bl_record order by cast(right(emr_no,len(emr_no)-1) as int) desc")
     String selectLastEmrNo();
 
 }

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

@@ -1354,6 +1354,11 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         }
         if (mzPrescriptionVo.getMzChargeDetailList() != null && mzPrescriptionVo.getMzChargeDetailList().size() > 0) {
             log.error(JsonUtil.object2Json(mzPrescriptionVo.getMzChargeDetailList()));
+            //查询是否存在未收款的处方数据,有就删除,再保存
+            List<MzChargeDetail> tempChargeDetails = mzChargeDetailMapper.selectNotPayMzChargeDetailByPatientId(mzPrescriptionVo.getMzChargeDetailList().get(0).getPatientId(), mzPrescriptionVo.getMzChargeDetailList().get(0).getTimes());
+            if(CollUtil.isNotEmpty(tempChargeDetails)){
+                mzChargeDetailMapper.deleteNotPayMzChargeDetailByPatientId(mzPrescriptionVo.getMzChargeDetailList().get(0).getPatientId(), mzPrescriptionVo.getMzChargeDetailList().get(0).getTimes());
+            }
             getMzChargeDetailService().saveMzChargeDetail(mzPrescriptionVo.getMzChargeDetailList());
         }
         if (StringUtils.isNotBlank(mzPrescriptionVo.getSerialNo())) {