Merge branch 'dev-1.1.4' into 'dev-1.1.4'

限制重复发药

See merge request lihong/thmz_system!54

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

@@ -530,7 +530,8 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
 
                     // 查询发药药单记录保存是否重复
                     if(ypZyPatientMapper.selectYpZyPatientRepetition(ypZyPatient) == 1){
-                        ypZyPatientMapper.updateYpZyPatientAmount(ypZyPatient);
+//                        ypZyPatientMapper.updateYpZyPatientAmount(ypZyPatient);
+                        throw new MzException("发药失败，药单号[" + ypZyPatient.getPageNo() + "],药品编码[" + ypZyPatient.getChargeCode() + "]已发药或者同一病人同一时间同一药品相同医嘱号发药数量，科室不能相同，请检查!");
                     } else {
                         ypZyPatientMapper.insertYpZyPatient(ypZyPatient);
                     }