From 75eaa22e62e5f59c8e756d801f4bd505ea3b5fa2 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Fri, 30 May 2025 16:27:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?upinfo=E8=A1=A8=E6=8F=92=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/enums/ChrgitmLvEnum.java | 8 +++++ .../server/common/util/DictoryUtil.java | 3 ++ .../social/SocialDirectoryService.java | 36 +++++++++++++++++++ .../service/social/SocialItemService.java | 21 +++++++++++ 4 files changed, 68 insertions(+) diff --git a/src/main/java/com/syjiaer/clinic/server/common/enums/ChrgitmLvEnum.java b/src/main/java/com/syjiaer/clinic/server/common/enums/ChrgitmLvEnum.java index 5f00557..bf9039a 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/enums/ChrgitmLvEnum.java +++ b/src/main/java/com/syjiaer/clinic/server/common/enums/ChrgitmLvEnum.java @@ -24,4 +24,12 @@ public enum ChrgitmLvEnum { } return null; } + public static String getCodeByName(String name) { + for (ChrgitmLvEnum chrgitmLvEnum : ChrgitmLvEnum.values()) { + if (chrgitmLvEnum.getName().equals(name)) { + return chrgitmLvEnum.getCode(); + } + } + return null; + } } diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java index c8d8728..ba1063b 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java @@ -70,6 +70,9 @@ public class DictoryUtil { } catch (IOException e) { e.printStackTrace(); } + if (content.isEmpty()){ + return new JSONArray(); + } JSONArray list = JSON.parseArray(content.toString()); return list; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java index e20d311..98559bb 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.common.enums.ChrgitmLvEnum; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.DateUtil; import com.syjiaer.clinic.server.common.util.DebugUtil; @@ -35,6 +36,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.math.BigInteger; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -90,6 +92,10 @@ public class SocialDirectoryService extends BaseService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("code", code_list); socialDirectoryMapper.delete(queryWrapper); + // 清除upinfo表里的老数据 + QueryWrapper upinfoQueryWrapper = new QueryWrapper<>(); + upinfoQueryWrapper.in("code", code_list); + socialDirectoryUpinfoMapper.delete(upinfoQueryWrapper); } return insertAll(version_name, type, tab_list); } @@ -97,11 +103,13 @@ public class SocialDirectoryService extends BaseService { private String insertAll(String version_name, int type, List tab_list) { Map title_map = dictoryUtil.getTitleMap(String.valueOf(type)); List list = new ArrayList<>(); + List upinfoList = new ArrayList<>(); HashMap tmp_map = new HashMap<>(); String next_version_name = ""; for (int i = 0; i < tab_list.size(); i++) { String[] line_array = tab_list.get(i); SocialDirectory socialDirectory = new SocialDirectory(); + SocialDirectoryUpinfo upinfo = new SocialDirectoryUpinfo(); socialDirectory.setType(type); String code = line_array[0]; socialDirectory.setId(code); @@ -121,6 +129,7 @@ public class SocialDirectoryService extends BaseService { socialDirectory.setName(map.get("name")); socialDirectory.setVersionName(map.get("version_name")); String flag = ""; + DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT); if (type == 1301) { flag = line_array[78]; @@ -128,12 +137,36 @@ public class SocialDirectoryService extends BaseService { socialDirectory.setKeyword(line_array[1] + "," + line_array[3] + "," + line_array[61]+","+socialDirectory.getProducer()+","+socialDirectory.getName()+","+socialDirectory.getCode()); socialDirectory.setCreateDatetime(LocalDateTime.parse(line_array[80], dateTimeFormatter)); socialDirectory.setUpdateDatetime(LocalDateTime.parse(line_array[81], dateTimeFormatter)); + + + upinfo.setCode(socialDirectory.getCode()); + upinfo.setBegndate(line_array[36]!=null &&!line_array[36].isEmpty()?DateUtil.getDateTime(line_array[36]):null); + upinfo.setEnddate(line_array[37]!=null &&!line_array[37].isEmpty()?DateUtil.getDateTime(line_array[37]):null); + upinfo.setWubi(line_array[49]); + upinfo.setPinyin(line_array[50]); + upinfo.setRid(new BigInteger(line_array[79])); + String chrgitm_lv = ChrgitmLvEnum.getCodeByName(line_array[91]); + upinfo.setChrgitmLv(chrgitm_lv); + + + + + + } if (type == 1302) { flag = line_array[13]; socialDirectory.setKeyword(line_array[19]+","+socialDirectory.getProducer()+","+socialDirectory.getName()+","+socialDirectory.getCode()); socialDirectory.setCreateDatetime(LocalDateTime.parse(DateUtil.parseAndFormatDate(line_array[15]), dateTimeFormatter)); socialDirectory.setUpdateDatetime(LocalDateTime.parse(DateUtil.parseAndFormatDate(line_array[16]), dateTimeFormatter)); + + + upinfo.setCode(socialDirectory.getCode()); + upinfo.setBegndate(line_array[11]!=null &&!line_array[11].isEmpty()?DateUtil.getDateTime(line_array[11]):null); + upinfo.setEnddate(line_array[12]!=null &&!line_array[12].isEmpty()?DateUtil.getDateTime(line_array[12]):null); + upinfo.setRid(new BigInteger(line_array[14])); + + } if (type == 1306) { flag = line_array[67]; @@ -159,6 +192,7 @@ public class SocialDirectoryService extends BaseService { next_version_name = socialDirectory.getVersionName(); } if (tmp_socialDirectory == null && flag.equals("1")) { + upinfoList.add(upinfo); list.add(socialDirectory); tmp_map.put(code, socialDirectory); } @@ -176,6 +210,8 @@ public class SocialDirectoryService extends BaseService { for (int i = 0; i < list.size(); i += 1000) { List subList = list.subList(i, Math.min(i + 1000, list.size())); socialDirectoryMapper.insertAll(subList); + List subUpinfoList = upinfoList.subList(i, Math.min(i + 1000, list.size())); + socialDirectoryUpinfoMapper.insert(subUpinfoList); } socialDirectoryVersionService.saveVersion(type, version_name, next_version_name, list.size()); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java index 0f5dbc0..901e8d1 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java @@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.service.social; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.common.util.DateUtil; import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.social.SocialDirectoryLimit; @@ -19,6 +20,11 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigInteger; +import java.text.DateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -43,13 +49,16 @@ public class SocialItemService extends BaseService { return null; } List list = new ArrayList<>(); + List upinfoList = new ArrayList<>(); String value = String.valueOf(1305); List codeList = new ArrayList<>(); String next_version_name = ""; + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); for (int i = 0; i < tab_list.size(); i++) { String[] line_array = tab_list.get(i); String flag = ""; SocialItem socialItem = new SocialItem(); + SocialDirectoryUpinfo upinfo = new SocialDirectoryUpinfo(); if (value.equals("1305")) { flag = line_array[6]; String code = line_array[0]; @@ -57,6 +66,13 @@ public class SocialItemService extends BaseService { socialItem.setName(line_array[9]); socialItem.setVersionName(line_array[15]); socialItem.setUnit(line_array[1]); + //upinfo表数据 + upinfo.setCode(code); + upinfo.setBegndate(line_array[11]!=null &&!line_array[11].isEmpty()? DateUtil.getDateTime(line_array[11]):null); + upinfo.setEnddate(line_array[12]!=null &&!line_array[12].isEmpty()?DateUtil.getDateTime(line_array[12]):null); + upinfo.setRid(new BigInteger(line_array[13])); + upinfoList.add(upinfo); + } else if (value.equals("1321")) { flag = line_array[13]; String code = line_array[2]; @@ -82,9 +98,14 @@ public class SocialItemService extends BaseService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("code", codeList); socialItemMapper.delete(queryWrapper); + + QueryWrapper upinfoQueryWrapper = new QueryWrapper<>(); + upinfoQueryWrapper.in("code", codeList); + socialDirectoryUpinfoMapper.delete(upinfoQueryWrapper); } socialItemMapper.insert(list, 100); + socialDirectoryUpinfoMapper.insertOrUpdate(upinfoList, 100); return next_version_name; } From 7e23b18705b2350ffd07cd5a8ea18d97ca078f2c Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Fri, 30 May 2025 16:43:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?item,goods,item=5Fgroup=5Flist=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=92=8C=E4=BF=AE=E6=94=B9=E6=97=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=863301=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/util/DictoryUtil.java | 3 --- .../controller/item/ItemController.java | 1 + .../server/service/goods/GoodsService.java | 9 +++++++++ .../server/service/item/ItemService.java | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java index ba1063b..c8d8728 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java @@ -70,9 +70,6 @@ public class DictoryUtil { } catch (IOException e) { e.printStackTrace(); } - if (content.isEmpty()){ - return new JSONArray(); - } JSONArray list = JSON.parseArray(content.toString()); return list; } diff --git a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java index 74bbddb..985ea19 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java @@ -69,6 +69,7 @@ public class ItemController extends BaseController { public Result createItem() { Item item = parmsUtil.getObject("data", Item.class); itemService.save(item); + return success(); } /* diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java index 3f9b477..6b830fb 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java @@ -29,6 +29,7 @@ import com.syjiaer.clinic.server.mapper.inventory.InventoryMapper; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper; import com.syjiaer.clinic.server.service.BaseService; +import com.syjiaer.clinic.server.service.item.ItemService; import com.syjiaer.clinic.server.service.social.SocialDirectoryService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +45,8 @@ import java.util.Objects; @Service public class GoodsService extends BaseService { + @Autowired + private ItemService itemService; @Autowired private GoodsMapper goodsMapper; @Autowired @@ -132,6 +135,12 @@ public class GoodsService extends BaseService { } } + + //上传对照消息 3301 + if (goods.getHilistCode() != null){ + + itemService.call3301(goods.getHilistCode(),"goods","create"); + } return goods; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java index 496aa6a..b2d354f 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java @@ -133,6 +133,12 @@ public class ItemService extends BaseService { item.setPinyinFull(pinyin_full); item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getName()).toUpperCase()); itemMapper.insertOrUpdate(item); + + //上传对照消息 3301 + if (item.getSocialCode() != null){ + this.call3301(item.getSocialCode(),"item","create"); + } + } @@ -207,6 +213,12 @@ public class ItemService extends BaseService { item.setPinyinFull(pinyin_full); item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getName()).toUpperCase()); itemMapper.updateById(item); + + + //上传对照消息 3301 + if (item.getSocialCode() != null){ + this.call3301(item.getSocialCode(),"item","create"); + } } @@ -325,8 +337,15 @@ public class ItemService extends BaseService { itemGroup.setItemId(itemInfo.getId()); itemGroup.setDelFlag(false); itemGroupListMapper.insertOrUpdate(itemGroup); + + //上传对照消息 3301 + if (itemGroup.getSocialCode() != null){ + this.call3301(itemGroup.getSocialCode(),"item_group_list","create"); + } + } + itemInfo.setUpdateDatetime(LocalDateTime.now()); itemInfo.setUnitPrice(unitPrice); itemInfo.setPurchaseUnitPrice(purchaseUnitPrice); From 07bab4687b385150083c0410c4c25f83290a9b78 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Fri, 30 May 2025 17:16:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E4=BC=A0=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AE=9A=E7=82=B9=E5=8C=BB=E8=8D=AF=E6=9C=BA=E6=9E=84=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BC=96=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/charge/ChargeService.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index 799a473..c53d255 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -539,8 +539,11 @@ public class ChargeService extends BaseService { if (sdGoods == null){ throw new MessageException("本地医保目录中未查询到医保码为"+goodsList.getSocialCode()+"的商品信息"); } + if (sdGoods.getCompareCode() == null){ + throw new MessageException("医保服务项目"+goodsList.getSocialCode()+"未关联医保目录"); + } feedetail.setMed_list_codg(goodsList.getSocialCode()); - feedetail.setMedins_list_codg(String.valueOf(sdGoods.getId())); + feedetail.setMedins_list_codg(sdGoods.getCompareCode()); BigDecimal totalPrice = goodsList.getUnitPrice().multiply(new BigDecimal(goodsList.getNumber())); feedetail.setDet_item_fee_sumamt(totalPrice); feedetail.setCnt(new BigDecimal(goodsList.getNumber())); @@ -564,8 +567,11 @@ public class ChargeService extends BaseService { if (sdItem == null){ throw new MessageException("本地医保目录中未查询到医保码为"+itemList.getSocialCode()+"的医保服务项目"); } + if (sdItem.getCompareCode() == null){ + throw new MessageException("医保服务项目"+itemList.getSocialCode()+"未关联医保目录"); + } feedetail.setMed_list_codg(itemList.getSocialCode()); - feedetail.setMedins_list_codg(String.valueOf(sdItem.getId())); + feedetail.setMedins_list_codg(sdItem.getCompareCode()); BigDecimal totalPrice = itemList.getUnitPrice().multiply(new BigDecimal(itemList.getNumber())); feedetail.setDet_item_fee_sumamt(totalPrice); feedetail.setCnt(new BigDecimal(itemList.getNumber())); @@ -632,7 +638,7 @@ public class ChargeService extends BaseService { data.setPsn_no(registration.getPsnNo()); data.setMdtrt_cert_type(mdtrtCertType); data.setMdtrt_cert_no(mdtrtCertNo); - data.setMed_type("12"); + data.setMed_type(config.get("social", "medType")); data.setMedfee_sumamt(order.getTotalPrice()); data.setPsn_setlway("01"); data.setMdtrt_id(registration.getMdtrtId()); @@ -652,8 +658,8 @@ public class ChargeService extends BaseService { } data.setMinpacunt_drug_trac_cnt(BigDecimal.valueOf(minpacunt_drug_trac_cnt)); - IM2207A.ExpContent expContent = new IM2207A.ExpContent(); - data.setExp_content(expContent); +// IM2207A.ExpContent expContent = new IM2207A.ExpContent(); +// data.setExp_content(expContent); im2207A.setData(data); OM2207A om2207A = socialRequest.call2207A(im2207A); //完成订单 From 3b6a55fcf3b9cb0b88322149aaba1f339beb13f2 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Tue, 3 Jun 2025 14:47:36 +0800 Subject: [PATCH 4/4] =?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<>();