commit

src/main/java/cn/hnthyy/thmz/controller/LoginController.java

@@ -188,6 +188,14 @@ public class LoginController {
         resultMap.put("ybCode", employee.getYbCode());
         resultMap.put("userName", employee.getEmployeeName());
         resultMap.put("socialNo", employee.getSocialNo());
+        // 获取药师执业资格证号：优先取执业证编码，如果为空则取医保赋码
+        String pharPracCertNo = "";
+        if (StringUtils.isNotBlank(employee.getPracticeCertificate())) {
+            pharPracCertNo = employee.getPracticeCertificate();
+        } else if (StringUtils.isNotBlank(employee.getYbCode())) {
+            pharPracCertNo = employee.getYbCode();
+        }
+        resultMap.put("pharPracCertNo", pharPracCertNo);
         resultMap.put("message", "恭喜您，登录成功！");
         return resultMap;
     }

src/main/resources/static/js/login.js

@@ -76,6 +76,8 @@ function login() {
                 localStorage.setItem("ybCode",result.ybCode);
                 localStorage.setItem("userName",result.userName);
                 localStorage.setItem("socialNo",result.socialNo);
+                //药师执业资格证号
+                localStorage.setItem("pharPracCertNo",result.pharPracCertNo || '');
                 window.location.href='/thmz/menu/view';
             } else {
                 if($("#errorMessage").length==0){

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

@@ -3098,7 +3098,8 @@ function callYbSaleGoodsItem(realNo, orderNo, receiptNo, times, patientId, name,
         let item = tableData[i];
         
         // 参数验证
-        let doctorName = $("#employeeNameLabel").val() || '';
+        // 从处方明细数据中获取开方医师姓名
+        let doctorName = item.doctorName || item.employeeName || '';
         if (!doctorName) {
             console.warn('开方医师姓名为空，使用默认值');
             doctorName = '未知医师';
@@ -3112,7 +3113,7 @@ function callYbSaleGoodsItem(realNo, orderNo, receiptNo, times, patientId, name,
         // 构建医保接口参数（只传递必需参数）
         let ybData = {
             // 医疗目录编码（医保编码）
-            medListCodg: item.nationalCode || 'NMLC999',
+            medListCodg: item.nationalCode,
             
             // 开方医师姓名
             prscDrName: doctorName,
@@ -3120,14 +3121,14 @@ function callYbSaleGoodsItem(realNo, orderNo, receiptNo, times, patientId, name,
             // 药师姓名
             pharName: currentUserName,
             
-            // 药师执业资格证号
-            pharPracCertNo: pharPracCertNo || '',
+            // 药师执业资格证号（取当前操作者的药师执业资格证号）
+            pharPracCertNo: localStorage.getItem('pharPracCertNo') || '',
             
             // 销售/退货经办人姓名
             selRetnOpterName: currentUserName,
             
             // 就诊结算类型（1-医保结算 2-自费结算）
-            mdtrtSetlType: item.mdtrtSetlType || '1',
+            mdtrtSetlType: item.mdtrtSetlType || '2',
             
             // 处方药标志
             rxFlag: item.rxFlag || '0',