coding:问诊处方相关接口

fs-service/src/main/java/com/fs/hospital580/dto/PreDemandDto.java

@@ -28,6 +28,10 @@ public class PreDemandDto extends CommonDto implements Serializable {
     private String userFamilyAddr;          // 就诊人住址（最多30个字符）
     private String imgList;                 // 图片附件（url形式，最多三个），多个以英文逗号,隔开
     private String thirdReturnUrl;          // 结束问诊后跳回三方的地址
+
+    public void setThirdReturnUrl(Long orderId) {
+        this.thirdReturnUrl = "/pages_shopping/paymentOrder?orderId="+orderId;
+    }
 }
 
 

fs-service/src/main/java/com/fs/hospital580/vo/res/PrescriptionDetailRes.java

@@ -1,9 +1,7 @@
 package com.fs.hospital580.vo.res;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.hospital580.vo.PrescriptionMedicineScrmVo;
 import io.swagger.annotations.ApiModelProperty;
@@ -32,47 +30,36 @@ public class PrescriptionDetailRes implements Serializable {
     private Byte isPregnantWoman;
 
     @ApiModelProperty("是否哺乳期：0-否，1-是")
-    @TableField("is_lactation")
     private Byte isLactation;
 
     @ApiModelProperty("来源：0-微信小程序，1-APP，2-H5，3-支付宝小程序")
-    @TableField("souce_from")
     private Byte souceFrom;
 
     @ApiModelProperty("用药人姓名")
-    @TableField("user_family_name")
     private String userFamilyName;
 
     @ApiModelProperty("身份证")
-    @TableField("user_family_id_card")
     private String userFamilyIdCard;
 
     @ApiModelProperty("年龄")
-    @TableField("user_family_age")
     private Integer userFamilyAge;
 
     @ApiModelProperty("性别：1-男，2-女")
-    @TableField("user_family_gender")
     private Byte userFamilyGender;
 
     @ApiModelProperty("手机号码")
-    @TableField("user_family_phone")
     private String userFamilyPhone;
 
     @ApiModelProperty("关系：1-本人，2-父母，3-配偶，4-子女，5-其他")
-    @TableField("relationship")
     private Boolean relationship;
 
     @ApiModelProperty("就诊人住址（最多30个字符）")
-    @TableField("user_family_addr")
     private String userFamilyAddr;
 
     @ApiModelProperty("图片附件URL，多个以英文逗号隔开")
-    @TableField("img_list")
     private String imgList;
 
     @ApiModelProperty("结束问诊后跳回三方的地址")
-    @TableField("third_return_url")
     private String thirdReturnUrl;
 
     @ApiModelProperty("创建时间")
@@ -84,51 +71,39 @@ public class PrescriptionDetailRes implements Serializable {
     private LocalDateTime updateTime;
 
     @ApiModelProperty("处方id(580)")
-    @TableField("pid")
     private Long pid;
 
     @ApiModelProperty("医院名称")
-    @TableField("hospital_name")
     private String hospitalName;
 
     @ApiModelProperty("药店ID")
-    @TableField("store_id")
     private Long storeId;
 
     @ApiModelProperty("药店名称")
-    @TableField("store_name")
     private String storeName;
 
     @ApiModelProperty("问诊单ID(580)")
-    @TableField("diagnosis_id")
     private Long diagnosisId;
 
     @ApiModelProperty("医生签名时间")
-    @TableField("doctor_sign_time")
     private LocalDateTime doctorSignTime;
 
     @ApiModelProperty("医生ID")
-    @TableField("doctor_id")
     private Long doctorId;
 
     @ApiModelProperty("医生科室")
-    @TableField("doctor_office")
     private String doctorOffice;
 
     @ApiModelProperty("医生姓名")
-    @TableField("doctor_name")
     private String doctorName;
 
     @ApiModelProperty("诊断标签")
-    @TableField("tags")
     private String tags;
 
     @ApiModelProperty("处方状态(1正常 2已作废 )")
-    @TableField("status")
     private Byte status;
 
     @ApiModelProperty("备注")
-    @TableField("memo")
     private String memo;
 
     @ApiModelProperty("说明")
@@ -136,7 +111,6 @@ public class PrescriptionDetailRes implements Serializable {
     private String remarks;
 
     @ApiModelProperty("审核不通过的理由（可能为空）")
-    @TableField("reason")
     private String reason;
 
     @ApiModelProperty("处方图片地址")
@@ -144,34 +118,30 @@ public class PrescriptionDetailRes implements Serializable {
     private String dstFilePath;
 
     @ApiModelProperty("创建时间/开方时间")
-    @TableField("created_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createdTime;
 
     @ApiModelProperty("处方编号")
-    @TableField("serial_no")
     private String serialNo;
 
     @ApiModelProperty("处方审核状态:1为待审核，2为审核通过，3为审核不通过")
-    @TableField("audit_status")
     private Boolean auditStatus;
 
     @ApiModelProperty("审方时间")
-    @TableField("audit_time")
     private LocalDateTime auditTime;
 
     @ApiModelProperty("审方药师名称")
-    @TableField("audit_apothecary_name")
     private String auditApothecaryName;
 
     @ApiModelProperty("问诊知情确认页面URL")
-    @TableField("jump_url")
     private String jumpUrl;
 
     @ApiModelProperty("开方情况0未开方1开方2拒绝")
-    @TableField("prescription_status")
     private Byte prescriptionStatus;
 
     @ApiModelProperty("药品信息列表")
     private List<PrescriptionMedicineScrmVo> drugRspList;
+
+    @ApiModelProperty("商城订单id")
+    private Long storeOrderId;
 }

fs-service/src/main/java/com/fs/hospital580/vo/res/PrescriptionListRes.java

@@ -62,4 +62,8 @@ public class PrescriptionListRes implements Serializable {
 
     @ApiModelProperty("开方情况0待开方1已开方2未通过")
     private Byte prescriptionStatus;
+
+
+    @ApiModelProperty("处方编号")
+    private String serialNo;
 }

fs-service/src/main/resources/application-config-druid-yjb.yml

@@ -98,3 +98,10 @@ jst:
   app_secret: 5b7d9369dbcd414db45089bc047ebe1a #聚水潭2025-08-15
   authorization_code: 999999
   shop_code: "18849902"
+
+hospital580:
+  url: https://ehospital-openapi-test.sq580.com
+  clientId: yjbz_15700159162_test
+  secretKey: ESzFwwum4Jz95f4ubg4rP7lQG4LZsWFv
+  storeId: 17478
+  callbackUrl: https://userapp.bjyjbao.com/prod-api/hospital580/sync/medicine

fs-service/src/main/resources/application-dev.yml

@@ -168,4 +168,6 @@ hospital580:
     url: https://ehospital-openapi-test.sq580.com
     clientId: yjbz_15700159162_test
     secretKey: ESzFwwum4Jz95f4ubg4rP7lQG4LZsWFv
+    storeId: 17478
+    callbackUrl: http://v78ee625.natappfree.cc/hospital580/sync/medicine
 

fs-user-app/src/main/java/com/fs/app/facade/impl/Hospital580FacadeServiceImpl.java

@@ -104,6 +104,7 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
         BeanUtil.copyProperties(order, dto);
         dto.setBizOrderId(order.getPreId().toString());
         dto.setMemberId(order.getUserFamilyPhone());
+        dto.setThirdReturnUrl(vo.getStoreOrderId());
         dto.setBeforeAiDataList(vo.getBeforeAiDataList().stream().map(item -> {
             BeforeAiData textRecordDto = new BeforeAiData();
             textRecordDto.setSubjectId(item.getSubjectId());
@@ -228,6 +229,7 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
                             .userFamilyAge(order.getUserFamilyAge())
                             .prescriptionStatus(order.getPrescriptionStatus())
                             .doctorName(order.getDoctorName())
+                            .serialNo(order.getSerialNo())
                             .build();
                 })
                 .filter(Objects::nonNull)