取消接诊字段优化

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

@@ -397,7 +397,7 @@ public interface MzyReqrecMapper {
      * @param times
      * @return
      */
-    @Update("update mzy_reqrec set cancel_mark=0,visit_date=null,visit_dept=null,visit_doctor=null where patient_id = #{patientId} and times = #{times}")
+    @Update("update mzy_reqrec set visited_mark=0,cancel_mark=0,visit_date=null,visit_dept=null,visit_doctor=null where patient_id = #{patientId} and times = #{times}")
     int cancelClinic(@Param("patientId") String patientId,@Param("times") Integer times);
 
     /**

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

@@ -581,6 +581,9 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
             if (YesNoEnum.YES.code.equals(dbMzyReqrec.getVisitedMark())) {
                 throw new MzException("您操作的挂号记录已就诊，无法退费！");
             }
+            if(StringUtils.isNotBlank(dbMzyReqrec.getReceiptBill())){
+                throw new MzException("您操作的挂号记录已打发票，请前往收费窗口进行退费！");
+            }
             ReqrecRequestRelation reqrecRequestRelation = reqrecRequestRelationMapper.selectReqrecRequestRelation(dbMzyReqrec.getSerialNo());
             if (reqrecRequestRelation != null && reqrecRequestRelation.getRequestId() != null) {
                 mzyRequestMapper.updateLeftNumById(reqrecRequestRelation.getRequestId());