增加35051

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -72,6 +72,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -87,6 +88,8 @@ public class CtqyyClient extends CommonHttpClient {
 
 //    private final String[] buyType_3505 = {"QXCF001", "YPCF002"};
     private final String[] buyType_3506 = {};
+    private final String[] buyType_35051 = {"SC72197936495755"};
+
     @Resource
     AuthWarehouseUserMapper authWarehouseUserMapper;
     @Resource
@@ -1693,6 +1696,8 @@ public class CtqyyClient extends CommonHttpClient {
                     return optionUploadCollectOrder3505(ioCollectOrder);
                 } else if (matchBusType(busType, buyType_3506)) {
                     optionUploadCollectOrder3506(ioCollectOrder);
+                }  else if (matchBusType(busType, buyType_35051)) {
+                    return optionUploadCollectOrder35051(ioCollectOrder);
                 }   else {
                     return ResultVOUtils.error(520, "业务类型未找到对应上传接口");
                 }
@@ -2162,6 +2167,112 @@ public class CtqyyClient extends CommonHttpClient {
         return ResultVOUtils.error(500,"上传医保数据为空请核实");
 
     }
+    public BaseResponse optionUploadCollectOrder35051(IoCollectOrder ioCollectOrder) {
+        List<CollectOrderBizResponse> bizList = ioCollectOrder.getCollectOrderBizResponseList();
+
+        if (CollUtil.isNotEmpty(bizList)) {
+            List<Xsck35051Request> xsck35051Requests = new ArrayList<>();
+            for (CollectOrderBizResponse item : bizList) {
+                BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(item.getRelId());
+                String itemCode = basicUdirelEntity.getMainId();
+//                for (CollectOrderBizResponse item : collectOrderBizResponseList) {
+//                    if (item.getYbbm().equals(itemCode)) {
+                String[] codes = item.getFinishUdiCode().split(",");
+
+                String nameCode = item.getNameCode();
+                BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(
+                        new QueryWrapper<BasicProductsEntity>().eq("nameCode", nameCode).last("limit 1")
+                );
+                if (Objects.isNull(basicProductsEntity)) {
+                    return ResultVOUtils.error(500, "产品为空请检查");
+                }
+                Integer packLevel = Integer.valueOf(basicProductsEntity.getPackLevel());
+                List<DrugInfoRequest> drugTraceList = new ArrayList<>();
+                List<String> codeList = new ArrayList<>();
+                // 遍历fruits数组
+                for (String code : codes) {
+                    if (StrUtil.isNotBlank(code)) {
+                        List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
+                        if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
+                            for (RelCodeDetail relCodeDetail : relCodeDetailList) {
+                                codeList.add(relCodeDetail.getCurCode());
+
+                            }
+
+                        }
+                        // 级别为2的产品码不可能只有一个
+                        if (packLevel > 1 && codeList.size() < 2) {
+                            return ResultVOUtils.error(500, "大包装码关联关系拉取不到请检查" + code);
+                        }
+                    }
+                }
+                Set<String> set = new HashSet(codeList);
+                for (String code : set) {
+                    DrugInfoRequest request = new DrugInfoRequest();
+                    request.setDrug_trac_codg(code);
+                    drugTraceList.add(request);
+                }
+
+                if (CollUtil.isEmpty(drugTraceList)) {
+                    return ResultVOUtils.error(500, "单据要传的码为空请检查");
+                }
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String formattedDate = sdf.format(ioCollectOrder.getBillTime());
+                //todo 处方药标志先写死 后面要商量怎么获得
+                String rxFlag ="1";
+                log.error("optionUploadCollectOrder35051===item==="+item);
+                Xsck35051Request xsck35051Request = Xsck35051Request.builder()
+                        .med_list_codg(item.getYbbm())
+                        .fixmedins_hilist_id(item.getNameCode())
+                        .fixmedins_hilist_name(item.getCpmctymc())
+                        .fixmedins_bchno(item.getOrderIdFk())
+                        .prsc_dr_cert_type(null)
+                        .prsc_dr_certno(null)
+                        .prsc_dr_name(null)
+                        .phar_cert_type(null)
+                        .phar_certno(null)
+                        .phar_name(null)
+                        .phar_prac_cert_no(null)
+                        .hi_feesetl_type(null)
+                        .setl_id(null)
+                        .mdtrt_sn(null)
+                        .psn_no(null)
+                        .psn_cert_type(null)
+                        .certno(null)
+                        .psn_name(null)
+                        .manu_lotnum(item.getBatchNo())
+                        .manu_date(DateUtil.timeTransition(item.getProductDate()))
+                        .expy_end(DateUtil.timeTransition(item.getExpireDate()))
+                        .rx_flag(rxFlag)
+                        .trdn_flag(item.getTrdnFlag())
+                        .finl_trns_pric(null)
+                        .rxno(null)
+                        .rx_circ_flag(null)
+                        .rtal_docno(null)
+                        .stoout_no(null)
+                        .bchno(null)
+                        .drug_prod_barc(null)
+                        .shelf_posi(null)
+                        .sel_retn_cnt(item.getCount())
+                        .sel_retn_time(formattedDate)
+                        .sel_retn_opter_name(ioCollectOrder.getCreateUser())
+                        .memo(null)
+                        .mdtrt_setl_type(null)
+                        .drugtracinfo(drugTraceList).build();
+                xsck35051Requests.add(xsck35051Request);
+//                    }
+//                }
+            }
+            BaseXsck35051Request baseXsck35051Request = new BaseXsck35051Request();
+            baseXsck35051Request.setSelinfoDetail(xsck35051Requests);
+            String jsonStr = JSONUtil.toJsonStr(baseXsck35051Request);
+            JSONObject dataJson = JSONObject.parseObject(jsonStr);
+            return ybClient.ybPost("35051", dataJson);
+        } else {
+            return ResultVOUtils.error(500, "上传医保数据为空请核实");
+        }
+
+    }
 
 
     public void optionUploadCollectOrder3501(IoCollectOrder ioCollectOrder) {

src/main/java/com/glxp/mipsdl/entity/inout/CollectOrderBizResponse.java

@@ -127,4 +127,6 @@ public class CollectOrderBizResponse {
 
     private Integer autoResCount;
     private String replaceCode;
+    private String trdnFlag;
+
 }

src/main/java/com/glxp/mipsdl/req/yb/BaseXsck35051Request.java

@@ -0,0 +1,10 @@
+package com.glxp.mipsdl.req.yb;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BaseXsck35051Request {
+    private List<Xsck35051Request> selinfoDetail;
+}

src/main/java/com/glxp/mipsdl/req/yb/Xsck35051Request.java

@@ -0,0 +1,213 @@
+package com.glxp.mipsdl.req.yb;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 药品销售
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Xsck35051Request {
+
+
+    /**
+     * 医疗目录编码
+     */
+    private String med_list_codg;
+
+    /**
+     * 定点医药机构目录编号
+     */
+    private String fixmedins_hilist_id;
+
+    /**
+     * 定点医药机构目录名称
+     */
+    private String fixmedins_hilist_name;
+
+    /**
+     * 定点医药机构批次流水号
+     */
+    private String fixmedins_bchno;
+
+    /**
+     * 开方医师证件类型
+     */
+    private String prsc_dr_cert_type;
+
+    /**
+     * 开方医师证件号码
+     */
+    private String prsc_dr_certno;
+
+    /**
+     * 开方医师姓名
+     */
+    private String prsc_dr_name;
+
+    /**
+     * 药师证件类型
+     */
+    private String phar_cert_type;
+
+    /**
+     * 药师证件号码
+     */
+    private String phar_certno;
+
+    /**
+     * 药师姓名
+     */
+    private String phar_name;
+
+    /**
+     * 药师执业资格证号
+     */
+    private String phar_prac_cert_no;
+
+    /**
+     * 医保费用结算类型
+     */
+    private String hi_feesetl_type;
+
+    /**
+     * 结算ID
+     */
+    private String setl_id;
+
+    /**
+     * 就医流水号
+     */
+    private String mdtrt_sn;
+
+    /**
+     * 人员编号
+     */
+    private String psn_no;
+
+    /**
+     * 人员证件类型
+     */
+    private String psn_cert_type;
+
+    /**
+     * 证件号码
+     */
+    private String certno;
+
+    /**
+     * 人员姓名
+     */
+    private String psn_name;
+
+    /**
+     * 生产批号
+     */
+    private String manu_lotnum;
+
+    /**
+     * 生产日期
+     */
+    private String manu_date;
+
+    /**
+     * 有效期止
+     */
+    private String expy_end;
+
+    /**
+     * 处方药标志
+     */
+    private String rx_flag;
+
+    /**
+     * 拆零标志
+     */
+    private String trdn_flag;
+
+    /**
+     * 最终成交单价
+     */
+    private BigDecimal finl_trns_pric;
+
+    /**
+     * 处方号
+     */
+    private String rxno;
+
+    /**
+     * 外购处方标志
+     */
+    private String rx_circ_flag;
+
+    /**
+     * 零售单据号
+     */
+    private String rtal_docno;
+
+    /**
+     * 销售出库单据号
+     */
+    private String stoout_no;
+
+    /**
+     * 批次号
+     */
+    private String bchno;
+    /**
+     * 药品追溯码
+     */
+    private String drug_trac_codg;
+
+    /**
+     * 药品条形码
+     */
+    private String drug_prod_barc;
+
+    /**
+     * 货架位
+     */
+    private String shelf_posi;
+
+    /**
+     * 销售/退货数量
+     */
+    private Integer sel_retn_cnt;
+
+    /**
+     * 销售/退货时间
+     */
+    private String sel_retn_time;
+
+    /**
+     * 销售/退货经办人姓名
+     */
+    private String sel_retn_opter_name;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 就诊结算类型
+     */
+    private String mdtrt_setl_type;
+
+    /**
+     * 溯源码节点信息
+     */
+    private List<DrugInfoRequest> drugtracinfo;
+
+
+
+
+}

src/main/java/com/glxp/mipsdl/util/DateUtil.java

@@ -9,6 +9,8 @@ import lombok.extern.slf4j.Slf4j;
 import java.lang.management.ManagementFactory;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @Slf4j
@@ -482,4 +484,18 @@ public class DateUtil {
         String formattedDate = sdf.format(date);
         return formattedDate;
     }
+    public static String timeTransition(String input) {
+        if(StrUtil.isEmpty(input)){
+            return null;
+        }
+        // 定义输入日期的格式
+        DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyMMdd");
+        // 定义输出日期的格式
+        DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        // 将输入字符串解析为 LocalDate 对象
+        LocalDate date = LocalDate.parse(input, inputFormatter);
+        // 将 LocalDate 对象格式化为目标字符串
+        String output = date.format(outputFormatter);
+        return output;
+    }
 }

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       strict: false
       datasource:
         master:
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlfy_pro?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@@ -14,7 +14,7 @@ spring:
           #          username: SD_UDIJK
           #          password: SD_UDIJK
           #          driver-class-name: oracle.jdbc.driver.OracleDrive
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlfy_pro?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@@ -28,7 +28,7 @@ spring:
           #          username: SD_UDIJK
           #          password: SD_UDIJK
           #          driver-class-name: oracle.jdbc.driver.OracleDrive
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlfy_pro?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@@ -37,7 +37,7 @@ spring:
           #          username: I_YPZS
           #          password: zy02v4ys
           #          driver-class-name: oracle.jdbc.driver.OracleDrive
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlfy_pro?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver