对于医嘱表的事务全部删除。

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

@@ -205,6 +205,16 @@ public class CaoYaoYiZhuService {
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
+    public void generateHerbs(YzActOrderCy param, XinZhenYiZhu huanZheXinXi) {
+        dao.chaRuCaoYaoYiZhu(param, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getExecDept());
+        dao.chaRuCaoYaoXiangQing(param.getList(), param.getOrderNo());
+        dao.chaRuYiZhu(param, "草药医嘱:" + param.getOrderName() + param.getQuantity() + "剂",
+                huanZheXinXi.getDeptCode(),
+                huanZheXinXi.getDeptCode(),
+                param.getExecDept(),
+                PublicServer.getInfantFlag(huanZheXinXi.getInpatientNo()));
+    }
+
     @NotNull
     private static List<String> limitation(XinZhenYzActOrder feiYongXinXi, Integer doctorLevel, YzActOrderCyDetail item) {
         List<String> errorMessage = new ArrayList<>();
@@ -230,16 +240,6 @@ public class CaoYaoYiZhuService {
         return errorMessage;
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    public void generateHerbs(YzActOrderCy param, XinZhenYiZhu huanZheXinXi) {
-        dao.chaRuCaoYaoYiZhu(param, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getExecDept());
-        dao.chaRuCaoYaoXiangQing(param.getList(), param.getOrderNo());
-        dao.chaRuYiZhu(param, "草药医嘱:" + param.getOrderName() + param.getQuantity() + "剂",
-                huanZheXinXi.getDeptCode(),
-                huanZheXinXi.getDeptCode(),
-                param.getExecDept(),
-                PublicServer.getInfantFlag(huanZheXinXi.getInpatientNo()));
-    }
 
     /**
      * 删除草药模板
@@ -275,7 +275,6 @@ public class CaoYaoYiZhuService {
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> shanChuCaoYao(String patNo, Integer times, BigDecimal orderNo) {
         YzActOrderCy cy = dao.caoYaoXinXi(patNo, times, orderNo);
         if (cy == null) {

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

@@ -98,7 +98,7 @@ public class HuiZhenShenQingService {
         param.setOrderName(String.format("请%s进行院内会诊", param.getReqDeptName()));
         XinZhenYiZhu patientInfo = yiZhuLuRuDao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         // 生成会诊和医嘱
-        getThis().generateConsultation(param, patientInfo);
+        generateConsultation(param, patientInfo);
         log.info("插入数据：{}", JSON.toJSONString(param));
         UserInfo userInfo = redisLikeService.getUserInfoByToken();
 
@@ -113,7 +113,6 @@ public class HuiZhenShenQingService {
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "会诊申请成功，正在通知会诊医生。");
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public void generateConsultation(YshHzRecord param, XinZhenYiZhu patInfo) {
         //插入会诊申请
         dao.chaRuHuiZhenShenQing(param);

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

@@ -286,7 +286,6 @@ public class JianYanJianChaShenQingService {
      * @param param 说明模板的内容
      * @return 返回提示
      */
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> shouMingMuBanChaoZuo(YshZdYjTemplate param) {
         switch (param.getLeiXing()) {
             case "修改":
@@ -386,7 +385,6 @@ public class JianYanJianChaShenQingService {
      * @param param 数据
      * @return 返回提示
      */
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> baoCunJianChaJianYanMuBan(ZyTcYj param) {
         param.setOpId(TokenUtil.getInstance().getTokenUserId());
         param.setTcNo(publicServer.huoQuJianYanJianChaXuHao().toString());
@@ -487,7 +485,6 @@ public class JianYanJianChaShenQingService {
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public void insertData(TianJiaJianChaJianYan param, XinZhenYiZhu patInfo, List<String> content) {
         String userCode = TokenUtil.getInstance().getTokenUserId();
 

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

@@ -183,12 +183,11 @@ public class ShouShuShenQingService {
         log.info("上传数据：{}", JSON.toJSONString(param));
         XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         // 生成手术
-        getThis().generativeSurgery(param, userCode, shenChengYiZhu, huanZheXinXi);
+        generativeSurgery(param, userCode, shenChengYiZhu, huanZheXinXi);
         publicServer.faSongXiaoXi(huanZheXinXi, content, "新增手术", TokenUtil.getInstance().getTokenUserId());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public void generativeSurgery(XinZengShouShu param, String userCode, List<OpRecord> shenChengYiZhu, XinZhenYiZhu huanZheXinXi) {
         dao.chaRuShouShuYiSheng(param.getList());
         dao.chaRuShouShu(param.getList(), param.getInpatientNo(), param.getName(), param.getAdmissTimes(),

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

@@ -1274,24 +1274,18 @@ public class YiZhuLuRuServer {
 
         if (checkData.getPassTheAudit()) {
             sendAMessageToTheNurse(patInfo, userCode, patInfo, "出院带药");
-            return getThis().getMapResultVo(patInfo, userCode);
+            Date now = new Date();
+            ListUtil.batchList(patInfo.getList(), YiZhuLuRuDao.class, (mapper, item) -> {
+                // 出院带药 确认了直接停止医嘱
+                mapper.takeMedicineAfterDischargeStopOrder(item.getActOrderNo(), userCode, now);
+            });
+            return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
         } else {
             return ResultVoUtil.fail(ExceptionEnum.ERROR_MESSAGE, "请修改有错误的医嘱。", map);
         }
 
     }
 
-    @NotNull
-    @Transactional(rollbackFor = Exception.class)
-    public ResultVo<Map<String, Object>> getMapResultVo(XinZhenYiZhu patInfo, String userCode) {
-        for (XinZhenYzActOrder order : patInfo.getList()) {
-            // 出院带药 确认了直接停止医嘱
-            dao.takeMedicineAfterDischargeStopOrder(order.getActOrderNo(), userCode, new Date());
-        }
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
     public void insertATemplate(List<XinZhenYzActOrder> list, XinZhenYiZhu patInfo) {
         String userCode = TokenUtil.getInstance().getTokenUserId();
         list.forEach(item -> {
@@ -1396,7 +1390,6 @@ public class YiZhuLuRuServer {
         return getThis().executeOneClickStopOrder(param);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> executeOneClickStopOrder(OneClickOrder param) {
         // 10507 固定医嘱号
         int count = dao.oneClickStopOrder(param, param.getUserCode());