Browse Source

医技科室退药无需判断毒麻药,以及作废医嘱时会先停止医嘱

xiaochan 2 years ago
parent
commit
be51b0fcd2

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/OrderQuashDao.java

@@ -84,7 +84,7 @@ public interface OrderQuashDao extends BaseMapper<ReqOrderQuash> {
     void eraseOrder(@Param("orderNo") BigDecimal orderNo);
 
     @Update("update yz_erase_order set modifier = enter_oper , " +
-            "status_time =getdate ( ) ," +
+            "status_time = getdate()," +
             " print_order_change =case when isnull ( print_order_change , '' ) ='' then 'd' else '' end where act_order_no =#{orderNo} ")
     void upErase(@Param("orderNo") BigDecimal orderNo);
 

+ 8 - 3
src/main/java/thyyxxk/webserver/service/hospitalizationCosts/HospitalizationCostsService.java

@@ -199,10 +199,15 @@ public class HospitalizationCostsService {
                         }
                     }
                 }
-                Integer count = drugKind.get(item.getChargeCodeMx().trim() + "_" + item.getSerial().trim(), (key) -> dao.getDrugKing(item.getChargeCodeMx().trim(), item.getSerial().trim()));
-                if (count > 0 && "refundOnly".equals(param.getRefundFlag())) {
-                    sb.append("药剂科要求,毒麻药药品无法,仅退费不退药品,请选择退费且退药。");
+
+                // 医技科室录入不要判断
+                if (!"3".equals(orderNo)) {
+                    Integer count = drugKind.get(item.getChargeCodeMx().trim() + "_" + item.getSerial().trim(), (key) -> dao.getDrugKing(item.getChargeCodeMx().trim(), item.getSerial().trim()));
+                    if (count > 0 && "refundOnly".equals(param.getRefundFlag())) {
+                        sb.append("药剂科要求,毒麻药药品无法,仅退费不退药品,请选择退费且退药。");
+                    }
                 }
+
             }
             if (StringUtil.notBlank(sb.toString())) {
                 error.append("流水号:【").append(item.getDetailSn()).append("】").append(sb).append("<br />");