优化住院医生中的批量停止医嘱和单个停止医嘱

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -850,7 +850,6 @@ public interface YiZhuLuRuDao {
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
             " #{item} " +
             "</foreach>" +
-            " and end_time is null and frequ_code &lt;&gt; 'ONCE' " +
             "</script>")
     List<YzActOrder> yiZhuXinXiJiHe(@Param("list") List<BigDecimal> list);
 

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/YiZhuTingZhiShiJian.java

@@ -17,6 +17,7 @@ import java.util.List;
  */
 @Data
 public class YiZhuTingZhiShiJian {
+
     @NotNull(message = "请选择数据")
     private List<BigDecimal> actOrderNoList;
 

src/main/java/thyyxxk/webserver/service/yibao/XiangMuLuRuService.java

@@ -278,6 +278,7 @@ public class XiangMuLuRuService {
      * @param xiangMuHuoYaoPinFlag 判断是查询项目还是药品 0 - 项目 1- 药品
      * @return 返回项目
      */
+    @DS("his")
     public ResultVo<List<ZyDetailCharge>> queryXiangMu(String pyCode, Integer xiangMuHuoYaoPinFlag) {
         if (xiangMuHuoYaoPinFlag == 0) {
             return ResultVoUtil.success(dao.queryXiangMu("%" + pyCode.toUpperCase() + "%"));

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -888,7 +888,7 @@ public class YiZhuLuRuServer {
         if (yz.getEndTime() != null) {
             return "该医嘱已经被停止了，无法修改。";
         }
-        if (DateUtil.shiJianDaXiao(content, DateUtil.formatDatetime(yz.getStartTime()), "<")) {
+        if (DateUtil.shiJianDaXiao(content, DateUtil.formatDatetime(yz.getStartTime()), "<=")) {
             return "停止时间不能在开始时间前面。";
         }
         if (ONCE.equals(yz.getFrequCode().trim())) {
@@ -899,6 +899,9 @@ public class YiZhuLuRuServer {
 
     @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> piLiangXiuGaiTingZhiShiJian(YiZhuTingZhiShiJian param) {
+        if (ListUtil.isBlank(param.getActOrderNoList())) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先选择数据");
+        }
         if (param.getActOrderNoList().size() > 20) {
             return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "批量操作每次不得大于20条");
         }