yb

src/main/java/cn/hnthyy/thmz/entity/yb/SelinfoSold.java

@@ -271,7 +271,7 @@ public class SelinfoSold {
     /**
      * 就诊结算类型（1-医保结算 2-自费结算）
      * */
-    @JSONField(name = "MDTRT_SETL_TYPE")
+    @JSONField(name = "mdtrt_setl_type")
     private String mdtrtSetlType;
 
     /**

src/main/java/cn/hnthyy/thmz/service/yb/YbService.java

@@ -92,6 +92,10 @@ public class YbService {
                 if(content != null && content.size() > 0) {
                     JSONObject item = content.getJSONObject(0);
                     JSONArray produceInfoList = item.getJSONObject("codeProduceInfoDTO").getJSONArray("produceInfoList");
+                    JSONObject drugEntBase = item.getJSONObject("drugEntBaseDTO");
+                    if(drugEntBase != null) {
+                        selInfo.setFixmedinsHilistName(drugEntBase.getString("physicName"));
+                    }
                     if(produceInfoList != null && produceInfoList.size() > 0) {
                         JSONObject produceInfo = produceInfoList.getJSONObject(0);
                         selInfo.setManuLotnum(produceInfo.getString("batchNo"));
@@ -112,6 +116,7 @@ public class YbService {
         selInfo.setSelRetnCnt(drugTracCodgList.size());
         String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         selInfo.setSelRetnTime(now);
+        selInfo.setFixmedinsHilistId(selInfo.getMedListCodg());
 
         String id = UUID.randomUUID().toString().replaceAll("-", "");
         selInfo.setId(id);
@@ -129,6 +134,7 @@ public class YbService {
         selInfo.setPrscDrName(UriEncoder.encode(selInfo.getPrscDrName()));
         selInfo.setPharName(UriEncoder.encode(selInfo.getPharName()));
         selInfo.setSelRetnOpterName(UriEncoder.encode(selInfo.getSelRetnOpterName()));
+        selInfo.setFixmedinsHilistName(UriEncoder.encode(selInfo.getFixmedinsHilistName()));
 
         // 构建关联键（用于后续查询发药记录）
         // 关联键格式：patientId=xxx&times=xxx&receiptNo=xxx&orderNo=xxx&chargeItemCode=xxx&realNo=xxx