优化代码

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/YizhuLuRuController.java

@@ -153,7 +153,7 @@ public class YizhuLuRuController {
     }
 
     @PostMapping("/insertTemplateOrder")
-    public ResultVo<String> insertTemplateOrder(@RequestBody XinZhenYiZhu param) {
+    public ResultVo<List<BigDecimal>> insertTemplateOrder(@RequestBody XinZhenYiZhu param) {
         return server.insertTemplateOrder(param);
     }
 

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

@@ -897,7 +897,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       page_no_ty " +
             "from yz_yp_zy_order a," +
             "yp_zd_dict b " +
-            "where page_no_ty = 0 " +
+            "where page_no_ty = -1 " +
             "  and dept_code = #{dept}" +
             "  and group_no = #{groupNo} " +
             "  and page_class = 'HT' " +

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

@@ -300,7 +300,7 @@ public class XiangMuLuRuService {
             // 退药明细
             dao.detailsOfDrugReturnForm(drug, patientInfo.getInpatientNo(), patientInfo.getAdmissTimes(),
                     patientInfo.getName(), patientInfo.getBedNo(), userInfo.getDeptCode(), infantFlag,
-                    param.getGroupNo(), TokenUtil.getTokenUserId(), 0, ledgerSn);
+                    param.getGroupNo(), TokenUtil.getTokenUserId(), -1, ledgerSn);
             // 药品的退药 标准 为 -2 申请退药
             dao.genXinZhenShuTuiFeiLiuShui(param.getInpatientNo(), param.getAdmissTimes(), ledgerSn, updateDrugLabel, -2);
             log.info("项目录入==》药品退费，操作人：{}，数据：{}", TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(drug, DateUtil.DEFAULT_PATTERN));

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

@@ -179,7 +179,6 @@ public class YiZhuLuRuServer {
      * @param code 拼音首字母，中文，编码来进行搜索
      * @return 返回项目信息
      */
-    @DS("his")
     public ResultVo<List<YiZhuMingChen>> huoQuXiangMu(String code, String groupNo) {
         code = StringUtil.isContainChinese(code);
         // 药品
@@ -490,19 +489,21 @@ public class YiZhuLuRuServer {
      * @param param 参数
      * @return
      */
-    public ResultVo<String> insertTemplateOrder(XinZhenYiZhu param) {
+    public ResultVo<List<BigDecimal>> insertTemplateOrder(XinZhenYiZhu param) {
         if (StringUtil.isBlank(param.getInpatientNo())) {
             return ResultVoUtil.fail(ExceptionEnum.ERROR_MESSAGE, "请先选择患者.");
         }
         Map<String, XinZhenYzActOrder> fatherAndSonDoctorSAdvice = new HashMap<>(param.getList().size());
+        List<BigDecimal> list = new ArrayList<>();
         param.getList().forEach(item -> {
             fatherAndSonDoctorSAdvice.put(item.getId(), item);
             item.setActOrderNo(publicServer.getActOrderNo());
+            list.add(item.getActOrderNo());
         });
         XinZhenYiZhu huanZheXinXi = dao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         // 把模板的数据插入到医嘱
         getThis().templateInsertToOrder(param, fatherAndSonDoctorSAdvice, huanZheXinXi);
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "插入模板数据成功。");
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "插入模板数据成功。", list);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -686,7 +687,6 @@ public class YiZhuLuRuServer {
      * @param serial 00-项目 01-小包装的药品 99-大包装
      * @return 返回该费用的一些详细信息，以及一些提示信息。
      */
-    @DS("his")
     public ResultVo<Map<String, Object>> huoQuFeiYongXinXi(String code, String serial, String deptCode, String groupNo) {
         Map<String, Object> map = new HashMap<>();
         // 一些提示
@@ -1172,7 +1172,6 @@ public class YiZhuLuRuServer {
      * @param total        总数
      * @return 返回模板
      */
-    @DS("his")
     public ResultVo<IPage<YzOrderPattern>> huoQuYiZhuMuBan(String code, String deptCode, Integer muBanLeiXing, long currentPage, long total) {
         IPage<YzOrderPattern> page = new Page<>();
         if (total == 0) {
@@ -1206,7 +1205,6 @@ public class YiZhuLuRuServer {
      * @param code 模板的编码
      * @return 返回数据
      */
-    @DS("his")
     public ResultVo<List<YzActOrder>> huoQuMuBanShuJu(String code) {
         List<YzActOrder> muBanShuJu = dao.huoQuMuBanShuJu(code);
         Map<BigDecimal, YzActOrder> map = new HashMap<>(muBanShuJu.size());