发票编码问题

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

@@ -53,7 +53,7 @@ public interface TransferInOfExpensesDao {
      * @param serialNo  机制号
      * @return 返回多个
      */
-    @Select("select patient_name   =rtrim(a.name), " +
+    @Select("select patient_name   =rtrim(a.name),item_no, " +
             "       item_name      = c.name, " +
             "       a.quantity, " +
             "       self_flag=c.self_flag, " +
@@ -86,7 +86,7 @@ public interface TransferInOfExpensesDao {
             "  and isnull(a.group_no, '00') = '00' " +
             "union " +
             "    all " +
-            "select patient_name   =rtrim(a.name), " +
+            "select patient_name   =rtrim(a.name),item_no, " +
             "       item_name      = (select name " +
             "                         from yp_zd_dict " +
             "                         where yp_zd_dict.code = c.charge_code " +

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

@@ -3,6 +3,7 @@ package thyyxxk.webserver.service.inpatient;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -71,6 +72,7 @@ public class TransferInOfExpensesService {
      * @param serialNo 机制号
      * @return 返回信息
      */
+
     public ResultVo<List<MzChargeDetail>> getSerialNo(Integer serialNo) {
         List<MzChargeDetail> list = dao.getSerialNo("mz_charge_detail", "mz_receipt_serial", serialNo);
         if (!list.isEmpty()) {
@@ -162,6 +164,7 @@ public class TransferInOfExpensesService {
     }
 
 
+
     public ResultVo<String> correctInvoice(CorrectInvoice.CorrectInvoiceReq param) {
         CorrectInvoice correctInvoice = dao.getSerialNoByInvoiceNo(param.getSerialNo());
         if (correctInvoice == null) {
@@ -189,6 +192,7 @@ public class TransferInOfExpensesService {
      * @param serialNo 机制号
      * @return 数据
      */
+     
     public ResultVo<CorrectInvoice.DzcfVo> getDzfpQrcodeBySerialNo(Integer serialNo) {
         CorrectInvoice correctInvoice = dao.getSerialNoByInvoiceNo(serialNo);
         return getDzfpQrcodeByCorrectInvoice(correctInvoice, serialNo);
@@ -211,7 +215,7 @@ public class TransferInOfExpensesService {
                 .eq("times", correctInvoice.getTimes())
                 .eq("receipt_no", correctInvoice.getReceiptNo())
                 .eq("serial_no", serialNo)
-                .in("charge_item_code", changeCodes);
+                .in("cast(item_no as varchar(500)) + '_' + rtrim(charge_item_code)", changeCodes);
 
         BigDecimal dzfpChangeTotal = dao.getDzfpChangeTotal(qw);
         uploadData.setPatientId(correctInvoice.getPatientId());
@@ -224,7 +228,6 @@ public class TransferInOfExpensesService {
         uploadData.setOpName(userCache.getEmployeeName(correctInvoice.getOpId()));
         uploadData.setPrintDate(DateUtil.format(new Date(), DatePattern.CHINESE_DATE_FORMAT));
         return R.ok(uploadData);
-
     }