commit

src/main/java/cn/hnthyy/thmz/service/impl/yb/YbParamDetailServiceImpl.java

@@ -3,7 +3,7 @@ package cn.hnthyy.thmz.service.impl.yb;
 import cn.hnthyy.thmz.entity.his.yb.SiPatInfo;
 import cn.hnthyy.thmz.entity.jy.ResultVo;
 import cn.hnthyy.thmz.entity.yb.DrugTracCodg;
-import cn.hnthyy.thmz.entity.yb.SelinfoSold;
+import cn.hnthyy.thmz.vo.yb.SelinfoSoldSimpleVo;
 import cn.hnthyy.thmz.service.his.yb.SiPatInfoService;
 import cn.hnthyy.thmz.service.yb.YbParamDetailService;
 import cn.hnthyy.thmz.vo.yb.*;
@@ -118,31 +118,27 @@ public class YbParamDetailServiceImpl implements YbParamDetailService {
         drugDetail.setQuantity(baseInfo.getQuantity());
         drugDetail.setUnitPrice(baseInfo.getUnitPrice());
 
-        // 构建医保接口参数
-        SelinfoSold selinfoSold = new SelinfoSold();
+        // 构建医保接口参数（精简版）
+        SelinfoSoldSimpleVo selinfoSold = new SelinfoSoldSimpleVo();
         selinfoSold.setPatientId(visitRecord.getPatientId());
         selinfoSold.setTimes(visitRecord.getTimes());
         selinfoSold.setReceiptNo(prescription.getReceiptNo());
         selinfoSold.setOrderNo(prescription.getOrderNo());
         selinfoSold.setChargeItemCode(baseInfo.getChargeItemCode());
         selinfoSold.setRealNo(prescription.getRealNo());
-        selinfoSold.setPsnName(visitRecord.getPsnName());
+
+        selinfoSold.setMedListCodg(baseInfo.getMedListCodg() != null ? baseInfo.getMedListCodg() : "");
+        selinfoSold.setPrscDrName(prescription.getDoctorName());
         selinfoSold.setPharName("宋荣芝");
-        selinfoSold.setSelRetnOpterName("宋荣芝");
         selinfoSold.setPharPracCertNo("HY321322000735");
+        selinfoSold.setSelRetnOpterName("宋荣芝");
         selinfoSold.setMdtrtSetlType(baseInfo.getMdtrtSetlType() != null ? baseInfo.getMdtrtSetlType() : "2");
-        
-        // 从药品字典表获取医保相关参数
-        selinfoSold.setMedListCodg(baseInfo.getMedListCodg() != null ? baseInfo.getMedListCodg() : "");
         selinfoSold.setRxFlag(baseInfo.getRxFlag() != null ? baseInfo.getRxFlag() : "0");
         selinfoSold.setTrdnFlag(baseInfo.getTrdnFlag() != null ? baseInfo.getTrdnFlag() : "0");
-        
-        // 补充患者相关参数
-        selinfoSold.setPrscDrName(prescription.getDoctorName()); // 开方医师姓名
-        selinfoSold.setPsnCertType(baseInfo.getPsnCertType() != null ? baseInfo.getPsnCertType() : "01"); // 人员证件类型
-        selinfoSold.setCertno(baseInfo.getCertno() != null ? baseInfo.getCertno() : ""); // 证件号码
-        selinfoSold.setPsnNo(visitRecord.getPsnNo()); // 医保人员编号
-        
+        selinfoSold.setPsnCertType(baseInfo.getPsnCertType() != null ? baseInfo.getPsnCertType() : "01");
+        selinfoSold.setCertno(baseInfo.getCertno() != null ? baseInfo.getCertno() : "");
+        selinfoSold.setPsnName(visitRecord.getPsnName());
+
         drugDetail.setSelinfoSold(selinfoSold);
 
         // 构建追溯码基本信息

src/main/java/cn/hnthyy/thmz/vo/yb/DrugDetailVo.java

@@ -1,7 +1,6 @@
 package cn.hnthyy.thmz.vo.yb;
 
 import cn.hnthyy.thmz.entity.yb.DrugTracCodg;
-import cn.hnthyy.thmz.entity.yb.SelinfoSold;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -17,7 +16,7 @@ public class DrugDetailVo {
     private String specification;    // 规格
     private BigDecimal quantity;     // 数量
     private BigDecimal unitPrice;    // 单价
-    private SelinfoSold selinfoSold; // 医保接口参数
+    private SelinfoSoldSimpleVo selinfoSold; // 医保接口参数（精简版）
     private List<DrugTracCodg> drugtracinfo; // 追溯码基本信息
     private List<DrugTracCodgDetailVo> drugtracinfoBeiZhu; // 追溯码详细信息
 } 

src/main/java/cn/hnthyy/thmz/vo/yb/SelinfoSoldSimpleVo.java

@@ -0,0 +1,41 @@
+package cn.hnthyy.thmz.vo.yb;
+
+import lombok.Data;
+
+/**
+ * 发药医保参数（精简版，仅前端实际使用的字段）
+ */
+@Data
+public class SelinfoSoldSimpleVo {
+    // 关联字段
+    private String patientId;
+    private Integer times;
+    private Integer receiptNo;
+    private Integer orderNo;
+    private String chargeItemCode;
+    private Integer realNo;
+
+    // 医疗目录编码（医保编码）
+    private String medListCodg;
+
+    // 开方医师姓名
+    private String prscDrName;
+
+    // 药师信息
+    private String pharName;
+    private String pharPracCertNo;
+    private String selRetnOpterName;
+
+    // 就诊结算类型
+    private String mdtrtSetlType;
+
+    // 处方药/拆零标志
+    private String rxFlag;
+    private String trdnFlag;
+
+    // 患者相关参数
+    private String psnCertType;
+    private String certno;
+    private String psnName;
+}
+