fix:580医院对接 部分bug

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

@@ -11,7 +11,7 @@ import java.util.List;
 public class PreDemandDto extends CommonDto implements Serializable {
 
     private String memberId;                // 第三方系统问诊人唯一标识(一般为患者手机号)
-    private Integer storeId;                // 门店ID（由580提供，每个三方对应值不一样）
+    private String storeId;                // 门店ID（由580提供，每个三方对应值不一样）
     private Integer serviceType;            // 服务类型，0为图文，1为视频
     private Integer isExamine;              // 是否需要审方（0为不需要，1为需要）
     private Integer isPregnantWoman;        // 是否孕妇0为否，1为是

fs-service/src/main/java/com/fs/hospital580/entity/FsStoreHospital580PrescriptionMedicineScrmEntity.java

@@ -34,8 +34,8 @@ public class FsStoreHospital580PrescriptionMedicineScrmEntity extends Model<FsSt
     private Long id;
 
     @ApiModelProperty("处方订单ID")
-    @TableField("order_id")
-    private Long orderId;
+    @TableField("pre_id")
+    private Long preId;
 
     @ApiModelProperty("药品通用名")
     @TableField("drug_common_name")

fs-service/src/main/java/com/fs/hospital580/entity/FsStoreHospital580PrescriptionScrmEntity.java

@@ -30,8 +30,8 @@ public class FsStoreHospital580PrescriptionScrmEntity extends Model<FsStoreHospi
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键ID")
-    @TableId(value = "p_id", type = IdType.AUTO)
-    private Long pId;
+    @TableId(value = "pre_id", type = IdType.AUTO)
+    private Long preId;
 
     @ApiModelProperty("处方id(580)")
     @TableField("pid")
@@ -139,6 +139,6 @@ public class FsStoreHospital580PrescriptionScrmEntity extends Model<FsStoreHospi
 
     @Override
     public Serializable pkVal() {
-        return this.pId;
+        return this.preId;
     }
 }

fs-service/src/main/java/com/fs/hospital580/service/impl/Hospital580ServiceImpl.java

@@ -22,7 +22,7 @@ public class Hospital580ServiceImpl implements Hospital580Service {
     @Value("${hospital580.secretKey:''}")
     private String SECRETKEY;
     @Value("${hospital580.storeId:''}")
-    private Integer storeId;
+    private String storeId;
     /**
      * 4.7 同步药品信息接口-580提供
      */

fs-service/src/main/resources/mapper/hospital580/FsStoreHospital580PrescriptionMedicineScrmMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.fs.hospital580.entity.FsStoreHospital580PrescriptionMedicineScrmEntity">
         <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
+        <result column="pre_id" property="preId" />
         <result column="drug_common_name" property="drugCommonName" />
         <result column="drug_name" property="drugName" />
         <result column="amount" property="amount" />
@@ -19,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, order_id, drug_common_name, drug_name, amount, instructions, spec, commodity_code, medicine_id, created_time, updated_time
+        id, pre_id, drug_common_name, drug_name, amount, instructions, spec, commodity_code, medicine_id, created_time, updated_time
     </sql>
 
 </mapper>

fs-service/src/main/resources/mapper/hospital580/FsStoreHospital580PrescriptionScrmMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.fs.hospital580.entity.FsStoreHospital580PrescriptionScrmEntity">
-        <id column="p_id" property="pId" />
+        <id column="pre_id" property="preId" />
         <result column="pid" property="pid" />
         <result column="hospital_name" property="hospitalName" />
         <result column="store_id" property="storeId" />
@@ -35,7 +35,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        p_id, pid, hospital_name, store_id, store_name, diagnosis_id
+        pre_id, pid, hospital_name, store_id, store_name, diagnosis_id
             , doctor_sign_time, doctor_id, doctor_office, doctor_name, user_family_name
             , user_family_phone, user_family_gender, user_family_age, tags, status, memo, remarks
             , reason, dst_file_path, order_id, created_time, updated_time, serial_no, audit_status, audit_time, audit_apothecary_name

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

@@ -13,7 +13,6 @@ import com.fs.hospital580.entity.*;
 import com.fs.hospital580.service.FsStoreHospital580AnswerScrmService;
 import com.fs.hospital580.service.Hospital580Service;
 import com.fs.hospital580.vo.*;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,7 +49,6 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
         PreDemandDto dto = new PreDemandDto();
         BeanUtil.copyProperties(vo, dto);
         dto.setBizOrderId(order.getOrderId().toString());
-        // 解析返回值
         Result580 result580 = hospital580Service.initPreDemand(dto);
         order.setJumpUrl(result580.getData());
         order.updateById();
@@ -75,6 +73,7 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
         drugRspList.forEach(item -> {
             FsStoreHospital580PrescriptionMedicineScrmEntity entity = new FsStoreHospital580PrescriptionMedicineScrmEntity();
             BeanUtil.copyProperties(item, entity);
+            entity.setPreId(prescription.getPreId());
             // 插入药品信息
             entity.insert();
         });
@@ -103,7 +102,7 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
         // 修改处方信息
         FsStoreHospital580PrescriptionScrmEntity prescription = new FsStoreHospital580PrescriptionScrmEntity();
         prescription.update(new LambdaUpdateWrapper<FsStoreHospital580PrescriptionScrmEntity>()
-                .eq(FsStoreHospital580PrescriptionScrmEntity::getPId, vo.getPid())
+                .eq(FsStoreHospital580PrescriptionScrmEntity::getPid, vo.getPid())
                 .set(FsStoreHospital580PrescriptionScrmEntity::getAuditStatus, vo.getAuditStatus())
                 .set(FsStoreHospital580PrescriptionScrmEntity::getAudiTime, vo.getAuditTime())
                 .set(FsStoreHospital580PrescriptionScrmEntity::getAuditApothecaryName, vo.getAuditApothecaryName())

fs-user-app/src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
 spring:
   profiles:
 #    active: dev
-    active: dev-yjb
+    active: dev
 #    active: druid-jzzx
 #    active: druid-yzt
 #    active: druid-hdt