no message

src/main/java/thyyxxk/webserver/dao/his/inpatient/XiangMuLuRuDao.java

@@ -579,7 +579,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
 
 
     @Select("<script>" +
-            "select rtrim(inpatient_no) inpatient_no,admiss_times,ledger_sn,charge_code_mx,detail_sn,ori_detail_sn,order_no,charge_fee,charge_amount, " +
+            "select rtrim(inpatient_no) as inpatient_no,admiss_times,ledger_sn,charge_code_mx,detail_sn,ori_detail_sn,order_no,charge_fee,charge_amount, " +
             "       exec_unit_name = (select rtrim(name) name from zd_unit_code where exec_unit = code),charge_date,trans_flag_yb, exec_unit, " +
             "       op_id_code = (select rtrim(name) name from a_employee_mi where code  = op_id_code)," +
             "       charge_code_name = (select rtrim(name) name from zd_charge_item where code = charge_code_mx),charge_code = 'xm' from zy_detail_charge " +

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

@@ -230,5 +230,4 @@ public interface CaoYaoYiZhuDao {
     void manualTransactions(@Param("patNo") String patNo,
                             @Param("times") Integer times,
                             @Param("orderNo") BigDecimal orderNo);
-
 }

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

@@ -560,7 +560,6 @@ public class XiangMuLuRuService {
         return ResultVoUtil.success(dao.getBingQuDuiYingKeShi(ward));
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<ZyActpatient> weiGuiFeiYongFenXi(String inpatientNo, String execUnit) {
         ZyActpatient patient = publicServer.huoQuHuanZheXinXi(inpatientNo);
         List<String> keShi = publicServer.huoQuBingFangDeKeShi(execUnit);
@@ -573,11 +572,12 @@ public class XiangMuLuRuService {
         if (!huoQuYaoPingZhongKeShiWeiKongDe.isEmpty()) {
             dao.yiZhuTuiFeiGenXingZhiXingKeShi(inpatientNo, patient.getAdmissTimes(), patient.getLedgerSn(), huoQuYaoPingZhongKeShiWeiKongDe);
         }
-        if (yaoPingBianMaTongBu.size() > 0) {
+        if (!yaoPingBianMaTongBu.isEmpty()) {
             dao.genXinYaoPingPiPeiXinXi(yaoPingBianMaTongBu);
         }
         patient.setWeiPiPei(new ArrayList<>());
         patient.setWeiXieDaiYuanLiuShui(new ArrayList<>());
+
         if ("al".equals(patient.getResponceType())) {
             patient.getWeiPiPei().addAll(dao.gongShangWeiPiPei(patient.getInpatientNo(), patient.getAdmissTimes(), patient.getLedgerSn(), patient.getInfantFlag()));
         } else {

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

@@ -222,7 +222,9 @@ public class CaoYaoYiZhuService {
     public void generateHerbs(YzActOrderCy param, XinZhenYiZhu huanZheXinXi) {
         dao.chaRuCaoYaoYiZhu(param, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getExecDept());
         dao.chaRuCaoYaoXiangQing(param.getList(), param.getOrderNo());
-        String orderName = param.getGroupNo().equals("81") ? "草药医嘱:" : "草药颗粒医嘱:" + param.getOrderName() + param.getQuantity() + "剂";
+        String orderName = param.getGroupNo().equals("81") ?
+                "草药医嘱:" :
+                "草药颗粒医嘱:" + param.getOrderName() + param.getQuantity() + "剂";
         dao.chaRuYiZhu(param, orderName,
                 huanZheXinXi.getDeptCode(),
                 huanZheXinXi.getDeptCode(),

src/main/resources/application-cytest.yml

@@ -15,7 +15,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: dev
+      primary: his
       strict: false
       datasource:
         his: