From cf6978979bf0806a00a3809039316ab9f6f9b186 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 2 Aug 2024 14:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BasicSkPrescribeDiEntity.java       |  7 ----
 .../basic/BasicSkPrescribeService.java        | 34 +++++++++++++++++--
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java
index 8ac60c67e..e6e40a31e 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java
@@ -55,13 +55,6 @@ public class BasicSkPrescribeDiEntity implements Serializable {
     @TableField(value = "relId")
     private Long relId;
 
-//    /**
-//     * DI标识
-//     */
-//    @TableField(value = "nameCode")
-//    private String nameCode;
-
-
     /**
      * 耗材名称
      */
diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java
index 01762643c..50f232328 100644
--- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java
+++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java
@@ -19,6 +19,7 @@ import com.glxp.api.req.basic.BasicSkPrescribeRequest;
 import com.glxp.api.req.basic.GetSickPrescribeRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicSkPrescribeResponse;
+import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.BasicSkPrescribeDiService;
 import com.glxp.api.service.thrsys.ThrProductsService;
 import com.glxp.api.util.IntUtil;
@@ -113,11 +114,11 @@ public class BasicSkPrescribeService extends ServiceImpl<BasicSkPrescribeMapper,
     UdiRelevanceService udiRelevanceService;
 
     /**
-     * 处方明细转换成处方使用耗材
+     * 处方明细转换成处方使用耗材(长泰的处方明细转换）（弃用）
      *
      * @return
      */
-    public void trSkPrescribeDi(BasicSkPrescribeItemEntity skPrescribeItemEntity) {
+    public void trSkPrescribeDi2(BasicSkPrescribeItemEntity skPrescribeItemEntity) {
 
         if (skPrescribeItemEntity.getItemCode() != null) {
             List<ThrProductsEntity> thrProductsEntities = thrProductsService.list(new QueryWrapper<ThrProductsEntity>().eq("prcitmcode", skPrescribeItemEntity.getItemCode()));
@@ -153,6 +154,35 @@ public class BasicSkPrescribeService extends ServiceImpl<BasicSkPrescribeMapper,
         }
     }
 
+    public void trSkPrescribeDi(BasicSkPrescribeItemEntity skPrescribeItemEntity) {
+
+//        if (skPrescribeItemEntity.getItemCode() != null) {
+////            List<ThrProductsEntity> thrProductsEntities = thrProductsService.list(new QueryWrapper<ThrProductsEntity>().eq("prcitmcode", skPrescribeItemEntity.getItemCode()));
+//            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById();
+//            BasicSkPrescribeDiEntity basicSkPrescribeDiEntity = basicSkPrescribeDiService.findByThrCode(skPrescribeItemEntity.getAdNum(), thrProductsEntity.getCode());
+//            if (basicSkPrescribeDiEntity == null) {
+//                basicSkPrescribeDiEntity = new BasicSkPrescribeDiEntity();
+//            }
+//            basicSkPrescribeDiEntity.setPrescribeCode(skPrescribeItemEntity.getPrescribeCode());
+//            basicSkPrescribeDiEntity.setSickerCode(skPrescribeItemEntity.getSickerCode());
+//            basicSkPrescribeDiEntity.setCount(IntUtil.value(skPrescribeItemEntity.getCount()));
+//            basicSkPrescribeDiEntity.setMeasureCount(basicSkPrescribeDiEntity.getMeasureCount() + "");
+//            basicSkPrescribeDiEntity.setMeasureUnit(skPrescribeItemEntity.getMeasureUnit());
+//            basicSkPrescribeDiEntity.setPId(thrProductsEntity.getPrcitmcode());
+//            UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), "thirdId");
+//            basicSkPrescribeDiEntity.setAmount(skPrescribeItemEntity.getAmount());
+//            basicSkPrescribeDiEntity.setRelId(udiRelevanceEntity.getId());
+//            basicSkPrescribeDiEntity.setThrCode(thrProductsEntity.getCode());
+//            basicSkPrescribeDiEntity.setThrName(thrProductsEntity.getName());
+//            basicSkPrescribeDiEntity.setCategory(thrProductsEntity.getCplb());
+//            basicSkPrescribeDiEntity.setGgxh(thrProductsEntity.getStandard());
+//            basicSkPrescribeDiEntity.setAdNum(skPrescribeItemEntity.getAdNum());
+//            basicSkPrescribeDiEntity.setUpdateTime(new Date());
+//            basicSkPrescribeDiService.save(basicSkPrescribeDiEntity);
+//
+//        }
+    }
+
 
     /**
      * 处方明细HIS收费项目对照