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

修复退药

See merge request lihong/thmz_system!74

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

@@ -747,7 +747,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             actpatient.setTableName(tableName);
             zyActpatientMapper.updateZyActpatientZy(actpatient);
         } if(isTy == 99){
-            YzActOrderCy cy = yzActOrderCyMapper.selectYzActOrderCyByPageNoAndFour(pageNo, "T");
+            YzActOrderCy cy = yzActOrderCyMapper.selectYzActOrderCyByPageNoAndFour(pageNo, "5");
             if(cy != null){
                 throw new MzException("确认退药失败，请勿重复退药！药单号：" + pageNo);
             }