Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

src/main/java/cn/hnthyy/thmz/mapper/his/yz/YzYpZyOrderMapper.java

@@ -248,7 +248,7 @@ public interface YzYpZyOrderMapper {
             " and charge_code =#{yzYpZyOrder.chargeCode}"+
             "</when>"+
             "<when test='yzYpZyOrder.occTime!=null'>"+
-            " and convert(varchar(19),occ_time,20) =#{yzYpZyOrder.occTime}"+
+            " and convert(varchar(19),occ_time,20) =convert(varchar(19),#{yzYpZyOrder.occTime},20)"+
             "</when>"+
             "<when test='yzYpZyOrder.pageNo!=null'>"+
             " and page_no =#{yzYpZyOrder.pageNo}"+

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

@@ -481,14 +481,14 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                     y.setChargeCode(yzYpZyOrder.getChargeCode());
                     y.setOccTime(yzYpZyOrder.getOccTime());
                     if (1 != yzYpZyOrderMapper.updateStatusFlag(y)) {
-                        throw new MzException("修改医嘱药品发药状态异常");
+                        throw new MzException("修改药品发药状态异常");
                     }
                     if (yzYpZyOrder.getPageClass().equals("HT")) {//护士退药单
                         ZyDetailCharge zyDetailCharge = new ZyDetailCharge();
                         zyDetailCharge.setInpatientNo(yzYpZyOrder.getInpatientNo());
                         zyDetailCharge.setAdmissTimes(yzYpZyOrder.getAdmissTimes());
                         if (yzYpZyOrder.getLedgerSn() == null || yzYpZyOrder.getDetailSn() == null) {
-                            throw new MzException("修改医嘱药品发药状态异常");
+                            throw new MzException("流水号、账页号为空，修改药品发药状态异常");
                         }
                         zyDetailCharge.setLedgerSn(yzYpZyOrder.getLedgerSn());
                         zyDetailCharge.setDetailSn(yzYpZyOrder.getDetailSn());