Merge branch 'dev' of http://47.103.65.67:3000/yeguodong/thmz into dev

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -1038,7 +1038,7 @@ public class MzPharmacyController {
                 String manufactoryName = ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode());
                 map.put("manufactoryName", manufactoryName);//生产厂家
                 String packUnitName = mzPharmacyService.getYpUnitName(ypZdDict.getPackUnit());
-                map.put("gruopOrder", chargeDetail.getGroupOrder());//药品组号
+                map.put("groupOrder", chargeDetail.getGroupOrder());//药品组号
                 if (ypZdGroupNameService.isXyf(chargeDetail.getGroupNo())) {
                     String drugUnitName = mzPharmacyService.getYpUnitName(chargeDetail.getDrugUnit());
                     map.put("ypUnitName", packUnitName);//单位

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzChargeDetailMapper.java

@@ -901,6 +901,7 @@ public interface MzChargeDetailMapper {
             "<when test='groupNo!=null'>" +
             " and c.group_no =#{groupNo}" +
             "</when>" +
+            " ORDER BY c.group_order" +  // 按group_order排序
             "</script>"})
     List<MzChargeDetail> selectMzChargeDetailList(MzChargeDetail mzChargeDetail);
 

src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -2727,6 +2727,7 @@ function printView(data) {
         $("#age").attr("value", age);
     }
     var list = data.list;
+    console.log('list',list);
     if (age.substring(0, age.indexOf('岁')) < 18 && yf.xyFlag === '1') {
         $('#drugFlag').attr("value", "儿科");
         printIndex = ekCfPrintIndex;
@@ -2875,7 +2876,7 @@ function getXyPrintHtml(list) {
             '<tr>' +
             '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' +
             '    </td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + manufactoryName + tryFlag +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + '组&nbsp;&nbsp;(' + list[i].groupOrder + ')' + tryFlag +
             '    </td>' +
             '    <td colspan="4" style="padding-left:0;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 13px;">用法：' + list[i].drugQuan + "&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequencyName + '&nbsp;&nbsp;' + printName +
             '    </td>' +
@@ -2893,8 +2894,8 @@ function getXyPrintHtml(list) {
             // '    </td>' +
             // '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">货位号:' + list[i].location +
             // '    </td>' +
-            '    <td colspan="4" style="padding-left:0;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 13px;">零售价：' + list[i].packRetprice + '&nbsp;元/' + list[i].ypUnitName +
-            '    </td>' +
+            // '    <td colspan="4" style="padding-left:0;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 13px;">零售价：' + list[i].packRetprice + '&nbsp;元/' + list[i].ypUnitName +
+            // '    </td>' +
             '</tr><tr style="height: 5px;"><td><img src="about:blank" width="5" height="5" /></td></tr>';
     }
     $('#yxwk').remove();
@@ -3311,7 +3312,7 @@ function callYbSaleGoodsItem(realNo, orderNo, receiptNo, times, patientId, name,
  * @param name 病人姓名
  */
 function callYbReturnGoodsItem(realNo, orderNo, receiptNo, times, patientId, name) {
-    // 获取退药明细数据 - 使用全局变量中保存的退药数据
+    // 获取退药明细数据 - 直接使用退药表格数据
     let tableData = window.currentRefundData || $table.bootstrapTable('getData');
     
     if (!tableData || tableData.length === 0) {
@@ -3393,46 +3394,17 @@ function callYbReturnGoodsItem(realNo, orderNo, receiptNo, times, patientId, nam
             drugtracinfo: []
         };
         
-        // 处理追溯码（从退药匹配表格获取）
-        let tyTable = $('#ty_table_detail').bootstrapTable("getData");
-        if (tyTable && tyTable.length > 0) {
-            // 查找对应的追溯码
-            for (let j = 0; j < tyTable.length; j++) {
-                let tyItem = tyTable[j];
-                
-                // 调试日志
-                console.log('追溯码匹配检查:', {
-                    'tyItem.chargeItemCode': tyItem.chargeItemCode,
-                    'item.charge_item_code': item.charge_item_code,
-                    'tyItem.serial': tyItem.serial,
-                    'item.serial': item.serial,
-                    'tyItem.itemNo': tyItem.itemNo,
-                    'item.item_no': item.item_no,
-                    'tyItem.drugTracCodg': tyItem.drugTracCodg
+        // 直接从退药表格获取追溯码（与发药接口保持一致）
+        if (item.drugTracCodg && item.drugTracCodg.trim() !== '') {
+            let tracCodes = item.drugTracCodg.split('<br>').filter(code => code.trim() !== '');
+            for (let j = 0; j < tracCodes.length; j++) {
+                ybData.drugtracinfo.push({
+                    drugTracCodg: tracCodes[j].trim()
                 });
-                
-                // 匹配条件：收费项目编码、流水号、项目序号
-                if (tyItem.chargeItemCode === item.charge_item_code && 
-                    tyItem.serial === item.serial && 
-                    tyItem.itemNo === item.item_no) {
-                    
-                    console.log('追溯码匹配成功:', tyItem.drugTracCodg);
-                    
-                    if (tyItem.drugTracCodg && tyItem.drugTracCodg.trim() !== '') {
-                        // 提取追溯码（去除HTML标签）
-                        let tracCode = tyItem.drugTracCodg.replace(/<[^>]*>/g, '').trim();
-                        if (tracCode) {
-                            ybData.drugtracinfo.push({
-                                drugTracCodg: tracCode
-                            });
-                            console.log('添加追溯码到医保参数:', tracCode);
-                        }
-                    }
-                    break;
-                }
             }
+            console.log('从退药表格获取追溯码:', tracCodes);
         } else {
-            console.log('退药匹配表格为空，无法获取追溯码');
+            console.log('退药表格中没有追溯码信息');
         }
         
         // 如果没有追溯码，添加空数组（保持数据结构一致）

src/main/resources/templates/mz/west_pharmacy_send.html

@@ -456,7 +456,7 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <div id="zbr_div" style="position: absolute;top:640px; ">
+                            <div id="zbr_div" style="position: absolute;top:620px; ">
                                 <div style="margin-bottom: 5px;margin-top: 10px;">
                                     <span style="font-size: 12px;">医&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;师:</span>
                                     <span style="display:inline-block;font-size: 12px;border-top: 0;border-left: 0;border-right: 0;border-bottom: 1px solid;width: 120px;background-color: white;color: black;"
@@ -465,13 +465,13 @@
                                     <span style="display:inline-block;font-size: 12px;border-top: 0;border-left: 0;border-right: 0;border-bottom: 1px solid;width: 120px;background-color: white;color: black;"
                                           disabled id="totalPrice"></span>
                                     <br/>
-                                    <span style="font-size: 12px;">审核药师:</span>
-                                    <span style="display:inline-block;font-size: 12px;border-top: 0;border-left: 0;border-right: 0;border-bottom: 1px solid;width: 120px;background-color: white;color: black;"
-                                          disabled id="shName"></span>
-                                    <span style="margin-bottom: 5px;margin-left: 50px;font-size: 12px;">核对药师:</span>
-                                    <span style="display:inline-block;font-size: 12px;border-top: 0;border-left: 0;border-right: 0;border-bottom: 1px solid;width: 120px;background-color: white;color: black;"
-                                          disabled id="hdName"></span>
-                                    <br/>
+<!--                                    <span style="font-size: 12px;">审核药师:</span>-->
+<!--                                    <span style="display:inline-block;font-size: 12px;border-top: 0;border-left: 0;border-right: 0;border-bottom: 1px solid;width: 120px;background-color: white;color: black;"-->
+<!--                                          disabled id="shName"></span>-->
+<!--                                    <span style="margin-bottom: 5px;margin-left: 50px;font-size: 12px;">核对药师:</span>-->
+<!--                                    <span style="display:inline-block;font-size: 12px;border-top: 0;border-left: 0;border-right: 0;border-bottom: 1px solid;width: 120px;background-color: white;color: black;"-->
+<!--                                          disabled id="hdName"></span>-->
+<!--                                    <br/>-->
                                     <span style="font-size: 12px;">调配药师:</span>
                                     <span style="display:inline-block;font-size: 12px;border-top: 0;border-left: 0;border-right: 0;border-bottom: 1px solid;width: 120px;background-color: white;color: black;"
                                           disabled id="tpName"></span>