|
@@ -69,14 +69,14 @@ public class YbService {
|
|
|
public ResultVo saleGoodsItem(SelinfoSoldTotal selinfoSoldTotal) {
|
|
|
ResultVo response = null;
|
|
|
SelinfoSold selInfo = selinfoSoldTotal.getSelinfoSold();
|
|
|
-
|
|
|
+ List<DrugTracCodg> drugTracCodgList = selinfoSoldTotal.getDrugtracinfo();
|
|
|
// 记录关联字段信息(用于关联发药记录)
|
|
|
// 这些字段用于后续查询发药记录,确保医保记录与发药记录的一一对应
|
|
|
- log.info("医保接口调用 - 关联字段: patientId={}, times={}, receiptNo={}, orderNo={}, chargeItemCode={}, realNo={}",
|
|
|
+ log.info("医保接口调用 - 关联字段: patientId={}, times={}, receiptNo={}, orderNo={}, chargeItemCode={}, realNo={}, drugTracCodgList={}",
|
|
|
selInfo.getPatientId(), selInfo.getTimes(), selInfo.getReceiptNo(),
|
|
|
- selInfo.getOrderNo(), selInfo.getChargeItemCode(), selInfo.getRealNo());
|
|
|
+ selInfo.getOrderNo(), selInfo.getChargeItemCode(), selInfo.getRealNo(), JSONObject.toJSONString(drugTracCodgList));
|
|
|
+
|
|
|
|
|
|
- List<DrugTracCodg> drugTracCodgList = selinfoSoldTotal.getDrugtracinfo();
|
|
|
if(drugTracCodgList == null || drugTracCodgList.isEmpty()) {
|
|
|
response = new ResultVo(-1, "追溯码不能为空");
|
|
|
return response;
|
|
@@ -304,7 +304,7 @@ public class YbService {
|
|
|
|
|
|
SelinfoSold selinfoSold = selinfoSoldList.get(0);
|
|
|
|
|
|
- selinfoReturn.setSelRetnCnt(drugTracCodgList != null ? drugTracCodgList.size() : 0);
|
|
|
+// selinfoReturn.setSelRetnCnt(drugTracCodgList != null ? drugTracCodgList.size() : 0);
|
|
|
String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
|
|
selinfoReturn.setMedListCodg(selinfoSold.getMedListCodg());
|
|
|
selinfoReturn.setSelRetnTime(now);
|