From 3b6a55fcf3b9cb0b88322149aaba1f339beb13f2 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Tue, 3 Jun 2025 14:47:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9Bbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/api/input/IM3202.java | 2 + .../clinic/server/entity/goods/GoodsCate.java | 44 +------------------ .../service/goods/GoodsCateService.java | 8 ++++ .../social/SocialReconciliationService.java | 11 ++--- 4 files changed, 18 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM3202.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM3202.java index 1e15128..3e8a4db 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM3202.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM3202.java @@ -34,6 +34,8 @@ public class IM3202 extends BaseInputModel{ private BigDecimal cash_payamt; @IMField(key = "fixmedins_setl_cnt", name = "定点医药机构结算笔数", required = true) private BigDecimal fixmedins_setl_cnt; + @IMField(key = "clr_type", name = "清算类别", required = true) + private String clr_type; @IMField(key = "refd_setl_flag", name = "退费结算标志") private String refd_setl_flag; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/goods/GoodsCate.java b/src/main/java/com/syjiaer/clinic/server/entity/goods/GoodsCate.java index 8f8b8ff..185373f 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/goods/GoodsCate.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/goods/GoodsCate.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import lombok.Data; import java.io.Serializable; /** @@ -16,6 +17,7 @@ import java.io.Serializable; */ @TableName("goods_cate") @ApiModel(value = "GoodsCate对象", description = "") +@Data public class GoodsCate implements Serializable { private static final long serialVersionUID = 1L; @@ -27,46 +29,4 @@ public class GoodsCate implements Serializable { private Integer type; private Integer sort; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - @Override - public String toString() { - return "GoodsCate{" + - "id = " + id + - ", name = " + name + - ", type = " + type + - ", sort = " + sort + - "}"; - } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsCateService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsCateService.java index 576ee1e..73d11da 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsCateService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsCateService.java @@ -69,6 +69,14 @@ public class GoodsCateService { * 参数 cateList 分类列表 */ public void save(List cateList){ + for (GoodsCate cate : cateList){ + if (cate.getName() == null || cate.getName().isEmpty()){ + throw new RuntimeException("分类名称不能为空"); + } + if (cate.getType() == null){ + throw new RuntimeException("分类父类型不能为空"); + } + } goodsCateMapper.insertOrUpdate(cateList); } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java index 70e89fe..bdaec73 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java @@ -136,8 +136,8 @@ public class SocialReconciliationService extends BaseService { inData.setInsutype(dto.getInsuranceType()); inData.setClr_type(dto.getReconciliationType()); inData.setSetl_optins(dto.getHandlingInstitution()); - inData.setStmt_begndate(dto.getBeginTime().toString()); - inData.setStmt_enddate(dto.getEndTime().toString()); + inData.setStmt_begndate(dto.getBeginTime().format(FORMATTER)); + inData.setStmt_enddate(dto.getEndTime().format(FORMATTER)); inData.setMedfee_sumamt(dto.getTotalMedicalCost()); inData.setFund_pay_sumamt(dto.getTotalFundPayment()); inData.setAcct_pay(dto.getTotalPersonalAccountPayment()); @@ -223,13 +223,14 @@ public class SocialReconciliationService extends BaseService { IM3202.Data inData = new IM3202.Data(); inData.setSetl_optins(dto.getHandlingInstitution()); inData.setFile_qury_no(om9101.getFile_qury_no()); - inData.setStmt_begndate(dto.getBeginTime().toString()); - inData.setStmt_enddate(dto.getEndTime().toString()); + inData.setStmt_begndate(dto.getBeginTime().format(FORMATTER)); + inData.setStmt_enddate(dto.getEndTime().format(FORMATTER)); inData.setMedfee_sumamt(dto.getTotalMedicalCost()); inData.setFund_pay_sumamt(dto.getTotalFundPayment()); inData.setCash_payamt(new BigDecimal(0)); inData.setFixmedins_setl_cnt(BigDecimal.valueOf(dto.getSettlementCount())); - inData.setRefd_setl_flag("0"); + inData.setClr_type(config.get("social", "medType")); + im3202.setData(inData); OM3202 om3202 = socialRequest.call3202(im3202); Map input_dw = new HashMap<>();