clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
LiJianZhao 2025-04-25 11:13:18 +08:00
parent e913d5f4ca
commit 6fafad14e3
18 changed files with 115 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java
View File

@ -51,8 +51,8 @@ public class OrganizationMemberController extends BaseController {
return success();
}
@RequestMapping("/getById")
public Result<OrganizationMember> getById() {
Integer id = parmsUtil.getInteger("id");
public Result<OrganizationMemberSaveDto> getById() {
Integer id = parmsUtil.getInteger("id","id不能为空");
return success(organizationMemberService.get(id));
}

14
src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java
View File

@ -4,8 +4,10 @@ import com.syjiaer.clinic.server.common.util.DictoryUtil;
import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.common.vo.Result;
import com.syjiaer.clinic.server.controller.BaseController;
import com.syjiaer.clinic.server.entity.social.SocialDiagnose;
import com.syjiaer.clinic.server.entity.social.SocialDirectory;
import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
import com.syjiaer.clinic.server.service.social.SocialDiagnoseService;
import com.syjiaer.clinic.server.service.social.SocialDirectoryService;
import com.syjiaer.clinic.server.service.social.SocialItemService;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,6 +35,8 @@ public class SocialDirectoryController extends BaseController {
@Autowired
private SocialItemService socialItemService;
@Autowired
private SocialDiagnoseService socialDiagnoseService;
@Autowired
private DictoryUtil dictoryUtil;
@RequestMapping("search")
@ -69,6 +73,10 @@ public class SocialDirectoryController extends BaseController {
version_name =socialItemService.download(ver);
return success(version_name);
}
if (type == 1307){
version_name = socialDiagnoseService.download(ver);
}
return error("参数 type 不正确");
@ -90,7 +98,13 @@ public class SocialDirectoryController extends BaseController {
int page = (Integer) parms.getOrDefault("page", 1);
int size = (Integer) parms.getOrDefault("size", 10);
String keyword = (String) parms.getOrDefault("search_keyword", "");
if (type == 1301 || type == 1302 || type == 1306){
return success(socialDirectoryService.getDocList(type,page,size,keyword));
}
if (type == 1305){
return success(socialItemService.getDocList(type,page,size,keyword));
}
return error("类型未定义");
}

26
src/main/java/com/syjiaer/clinic/server/entity/social/SocialItem.java
View File

@ -3,44 +3,40 @@ package com.syjiaer.clinic.server.entity.social;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 医保目录
* 医保服务项目目录1305,1320
* </p>
*
* @author NiuZiYuan
* @since 2025-04-02
* @since 2025-04-25
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
@TableName("social_item")
@ApiModel(value = "SocialItem对象", description = "医保服务项目目录")
@ApiModel(value = "SocialItem对象", description = "医保服务项目目录1305,1320")
public class SocialItem implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("名称")
@ApiModelProperty("项目名称")
private String name;
@ApiModelProperty("医保目录编码")
private String socialCode;
@ApiModelProperty("医保编码")
private String code;
@ApiModelProperty("单位")
private String unit;
@ -48,9 +44,9 @@ public class SocialItem implements Serializable {
@ApiModelProperty("数据创建时间")
private LocalDateTime createDatetime;
@ApiModelProperty("数据修改时间")
private LocalDateTime updateDatetime;
@ApiModelProperty("版本名称")
private String versionName;
@ApiModelProperty("数据修改时间")
private LocalDateTime updateDatetime;
}

11
src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java
View File

@ -1,6 +1,8 @@
package com.syjiaer.clinic.server.entity.social.vo;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import lombok.Getter;
import lombok.Setter;
@ -45,9 +47,11 @@ public class SocialDirectoryView implements Serializable {
private LocalDateTime updateDatetime;
private String versionName;
private String data;
private String unit;
private String hilistCode;
private String hilistLmtpricType;
private BigDecimal hilistPricUplmtAmt;
@ -63,4 +67,9 @@ public class SocialDirectoryView implements Serializable {
private String wubi;
private String pinyin;
private JSONObject json;
}

2
src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
View File

@ -313,7 +313,7 @@ public class ChargeService extends BaseService {
feedetail.setFee_ocur_time(LocalDateTime.now());
Item item = itemMapper.selectById(itemList.getServiceId());
SocialItem sdGoods = socialItemMapper.getByCode(item.getItemSocialCode());
feedetail.setMed_list_codg(sdGoods.getSocialCode());
feedetail.setMed_list_codg(sdGoods.getCode());
feedetail.setMedins_list_codg(String.valueOf(sdGoods.getId()));
BigDecimal totalPrice = itemList.getUnitPrice().multiply(new BigDecimal(itemList.getNumber()));
feedetail.setDet_item_fee_sumamt(totalPrice);

21
src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
View File

@ -1,6 +1,7 @@
package com.syjiaer.clinic.server.service.organization;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.FileUtil;
import com.syjiaer.clinic.server.common.vo.Page;
@ -115,19 +116,28 @@ public class OrganizationMemberService extends BaseService {
log.error("删除电子签名文件失败", e);
}
ManagerUser user = managerUserMapper.selectByOrganizationMemberId(id);
if (user != null) {
ManagerUser updateUser = new ManagerUser();
updateUser.setId(user.getId());
updateUser.setStatus(0);
managerUserMapper.deleteById(user.getId());
}
}
/*
* 根据id获取成员信息
* @param id 成员id
*/
public OrganizationMember get(int id) {
public OrganizationMemberSaveDto get(int id) {
if (id <= 0) {
throw new MessageException("id参数为空");
}
QueryWrapper<OrganizationMember> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("del_flag", false).eq("id", id);
return organizationMemberMapper.selectOne(queryWrapper);
OrganizationMemberSaveDto dto = new OrganizationMemberSaveDto();
dto.setMemberInfo(organizationMemberMapper.selectById(id));
dto.setUserInfo(managerUserMapper.selectByOrganizationMemberId(id));
return dto;
}
/*
@ -135,8 +145,7 @@ public class OrganizationMemberService extends BaseService {
*/
public List<OrganizationMember> doctorList() {
QueryWrapper<OrganizationMember> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("role", 1)
.eq("del_flag", false);
queryWrapper.eq("role", 1);
return organizationMemberMapper.selectList(queryWrapper);
}
}

4
src/main/java/com/syjiaer/clinic/server/service/social/SocialChineseMedicinalGranulaService.java
View File

@ -1,14 +1,12 @@
package com.syjiaer.clinic.server.service.social;
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.entity.social.SocialChineseMedicinalGranula;
import com.syjiaer.clinic.server.mapper.social.SocialChineseMedicinalGranulaMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@ -51,7 +49,7 @@ public class SocialChineseMedicinalGranulaService {
queryWrapper.in("social_code", code_list);
socialChineseMedicinalGranulaMapper.delete(queryWrapper);
socialChineseMedicinalGranulaMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(1320, version_name, list.get(0).getVersionName(), list.size());
socialDirectoryVersionService.saveVersion(1320, version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName();
}
}

4
src/main/java/com/syjiaer/clinic/server/service/social/SocialChronicDiseaseService.java
View File

@ -4,8 +4,6 @@ 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.entity.social.SocialChronicDisease;
import com.syjiaer.clinic.server.entity.social.SocialDiagnose;
import com.syjiaer.clinic.server.entity.social.SocialTcmDiseaseCatalogue;
import com.syjiaer.clinic.server.mapper.social.SocialChronicDiseaseMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -50,7 +48,7 @@ public class SocialChronicDiseaseService {
queryWrapper.in("social_code", code_list);
socialChronicDiseaseMapper.delete(queryWrapper);
socialChronicDiseaseMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(1309, version_name, list.get(0).getVersionName(), list.size());
socialDirectoryVersionService.saveVersion(1309, version_name, list.get(0).getVersionName(), list.size());
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("current_version_name", list.get(0).getVersionName());
hashMap.put("pre_version_name", version_name);

14
src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java
View File

@ -1,23 +1,16 @@
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.DictoryUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.entity.social.SocialChronicDisease;
import com.syjiaer.clinic.server.entity.social.SocialDiagnose;
import com.syjiaer.clinic.server.entity.social.SocialDirectory;
import com.syjiaer.clinic.server.entity.social.SocialItem;
import com.syjiaer.clinic.server.mapper.social.SocialDiagnoseMapper;
import com.syjiaer.clinic.server.mapper.social.SocialItemMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -30,7 +23,7 @@ public class SocialDiagnoseService {
@Autowired
private SocialDirectoryVersionService socialDirectoryVersionService;
public Map<String, Object> download( String version_name) {
public String download( String version_name) {
List<String[]> tab_list = httpUtil.download(version_name, 1307);
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
List<SocialDiagnose> list = new ArrayList<>();
@ -59,9 +52,8 @@ public class SocialDiagnoseService {
queryWrapper.in("code", codeList);
socialDiagnoseMapper.delete(queryWrapper);
socialDiagnoseMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(1307, version_name, list.get(0).getVersionName(), list.size());
return null;
// return list.get(0).getVersionName();
socialDirectoryVersionService.saveVersion(1307, version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName();
}
/**

11
src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java
View File

@ -4,7 +4,6 @@ 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.config.Config;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.*;
import com.syjiaer.clinic.server.common.vo.Page;
@ -124,7 +123,7 @@ public class SocialDirectoryService extends BaseService {
}
SocialDirectory tmp_socialDirectory = tmp_map.get(code);
if(i==0){
next_version_name=list.get(0).getVersionName();
next_version_name=socialDirectory.getVersionName();
}
if (tmp_socialDirectory == null && flag.equals("1")) {
list.add(socialDirectory);
@ -137,7 +136,7 @@ public class SocialDirectoryService extends BaseService {
return null;
}
socialDirectoryMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(type, version_name, list.get(0).getVersionName(), list.size());
socialDirectoryVersionService.saveVersion(type, version_name, list.get(0).getVersionName(), list.size());
return next_version_name;
}
@ -336,6 +335,7 @@ public class SocialDirectoryService extends BaseService {
socialDirectoryView.setSelfpayPropType(socialDirectorySelf.getSelfpayPropType());
socialDirectoryView.setSelfpayProp(socialDirectorySelf.getSelfpayProp());
}
socialDirectoryView.setJson(JSONObject.parse(socialDirectoryView.getData()));
return socialDirectoryView;
}
@ -345,11 +345,6 @@ public class SocialDirectoryService extends BaseService {
}
public Page<SocialDirectoryView> getDocList(int type, int page, int size, String keyword) {
Integer[] type_list = {1301, 1302, 1305, 1306, 1307, 1309, 1314, 1315, 1320, 1321};
//判断type在数组中
if (!Arrays.asList(type_list).contains(type)) {
throw new MessageException("参数 type 不能为空");
}
QueryWrapper<SocialDirectory> codeqw = new QueryWrapper<>();
codeqw.eq("type", type);

3
src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java
View File

@ -5,7 +5,6 @@ import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.StringUtil;
import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.entity.social.SocialDirectoryVersion;
import com.syjiaer.clinic.server.entity.social.SocialItem;
import com.syjiaer.clinic.server.mapper.social.SocialDirectoryVersionMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -84,7 +83,7 @@ public class SocialDirectoryVersionService {
* @param currentVersionName 当前版本名称
* @param size 数据量
*/
public void setSocialDirectoryVersion(int type, String preVersionName, String currentVersionName, int size) {
public void saveVersion(int type, String preVersionName, String currentVersionName, int size) {
SocialDirectoryVersion socialDirectoryVersion = new SocialDirectoryVersion();
socialDirectoryVersion.setId(stringUtil.generateRandomId());
socialDirectoryVersion.setType(type);

3
src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcDoctorDiagnoseService.java
View File

@ -3,7 +3,6 @@ package com.syjiaer.clinic.server.service.social;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DateUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.entity.social.SocialIcpcDoctorDiagnose;
@ -48,7 +47,7 @@ public class SocialIcpcDoctorDiagnoseService {
queryWrapper.in("social_code", code_list);
socialIcpcDoctorDiagnoseMapper.delete(queryWrapper);
socialIcpcDoctorDiagnoseMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(1361, pre_version_name, list.get(0).getVersionName(), list.size());
socialDirectoryVersionService.saveVersion(1361, pre_version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName();
}
}

4
src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcExaminationTreatmentService.java
View File

@ -3,10 +3,8 @@ package com.syjiaer.clinic.server.service.social;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DateUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.entity.social.SocialIcpcDoctorDiagnose;
import com.syjiaer.clinic.server.entity.social.SocialIcpcExaminationTreatment;
import com.syjiaer.clinic.server.mapper.social.SocialIcpcExaminationTreatmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
@ -50,7 +48,7 @@ public class SocialIcpcExaminationTreatmentService {
queryWrapper.in("social_code", code_list);
socialIcpcExaminationTreatmentMapper.delete(queryWrapper);
socialIcpcExaminationTreatmentMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(1361, pre_version_name, list.get(0).getVersionName(), list.size());
socialDirectoryVersionService.saveVersion(1361, pre_version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName();
}
}

4
src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcSelfPayingService.java
View File

@ -3,10 +3,8 @@ package com.syjiaer.clinic.server.service.social;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DateUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.entity.social.SocialIcpcDoctorDiagnose;
import com.syjiaer.clinic.server.entity.social.SocialIcpcSelfPaying;
import com.syjiaer.clinic.server.mapper.social.SocialIcpcSelfPayingMapper;
import org.springframework.beans.factory.annotation.Autowired;
@ -48,7 +46,7 @@ public class SocialIcpcSelfPayingService {
queryWrapper.in("social_code", code_list);
socialIcpcSelfPayingMapper.delete(queryWrapper);
socialIcpcSelfPayingMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(1361, pre_version_name, list.get(0).getVersionName(), list.size());
socialDirectoryVersionService.saveVersion(1361, pre_version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName();
}
}

64
src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java
View File

@ -1,30 +1,21 @@
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.DictoryUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.common.util.StringUtil;
import com.syjiaer.clinic.server.entity.social.SocialChineseMedicinalGranula;
import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.entity.social.SocialDirectory;
import com.syjiaer.clinic.server.entity.social.SocialDirectoryVersion;
import com.syjiaer.clinic.server.entity.social.SocialItem;
import com.syjiaer.clinic.server.mapper.social.SocialDirectoryVersionMapper;
import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
import com.syjiaer.clinic.server.mapper.social.SocialItemMapper;
import com.syjiaer.clinic.server.service.BaseService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@Service
public class SocialItemService {
public class SocialItemService extends BaseService {
@Autowired
private HttpUtil httpUtil;
@Autowired
@ -34,6 +25,9 @@ public class SocialItemService {
public String download( String version_name) {
List<String[]> tab_list = httpUtil.download(version_name, 1305);
if (tab_list.isEmpty()){
return null;
}
List<SocialItem> list = new ArrayList<>();
String value = String.valueOf(1305);
List<String> codeList = new ArrayList<>();
@ -45,14 +39,14 @@ public class SocialItemService {
if (value.equals("1305")) {
flag = line_array[6];
String code = line_array[0];
socialItem.setSocialCode(code);
socialItem.setCode(code);
socialItem.setName(line_array[9]);
socialItem.setVersionName(line_array[15]);
socialItem.setUnit(line_array[1]);
}else if (value.equals("1321")) {
flag = line_array[13];
String code = line_array[2];
socialItem.setSocialCode(code);
socialItem.setCode(code);
socialItem.setName(line_array[6]);
socialItem.setVersionName(line_array[21]);
socialItem.setUnit(line_array[10]);
@ -63,13 +57,13 @@ public class SocialItemService {
if (!flag.equals("1")) {
continue;
}
codeList.add(socialItem.getSocialCode());
codeList.add(socialItem.getCode());
list.add(socialItem);
}
socialDirectoryVersionService.setSocialDirectoryVersion(1305, version_name, next_version_name, list.size());
// if(list.isEmpty()){
// return next_version_name;
// }
socialDirectoryVersionService.saveVersion(1305, version_name, next_version_name, list.size());
if(list.isEmpty()){
return next_version_name;
}
if(!codeList.isEmpty()){
QueryWrapper<SocialItem> queryWrapper = new QueryWrapper<>();
queryWrapper.in("social_code", codeList);
@ -78,6 +72,32 @@ public class SocialItemService {
socialItemMapper.insert(list, 100);
return null;
return next_version_name;
}
public Page<SocialDirectoryView> getDocList(int type, int page, int size, String keyword) {
QueryWrapper<SocialItem> codeqw = new QueryWrapper<>();
//模糊搜索
if (!keyword.trim().isEmpty()) {
codeqw.like("name", keyword);
codeqw.or().like("code", keyword);
codeqw.or().like("keyword", keyword);
}
// 执行查询
Page<SocialItem> createDatetime = pageHelper(page, size, codeqw, socialItemMapper, "create_datetime", false);
List<SocialDirectoryView> list = new ArrayList<>();
for (SocialItem socialItem : createDatetime.getList()){
SocialDirectoryView view = new SocialDirectoryView();
BeanUtils.copyProperties(socialItem, view);
list.add(view);
}
Page<SocialDirectoryView> resultPage = new Page<>();
resultPage.setList(list);
resultPage.setTotal_page(createDatetime.getTotal_page());
resultPage.setTotal_count(createDatetime.getTotal_count());
return resultPage;
}
}

3
src/main/java/com/syjiaer/clinic/server/service/social/SocialTcmDiseaseCatalogueService.java
View File

@ -3,7 +3,6 @@ package com.syjiaer.clinic.server.service.social;
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.entity.social.SocialChronicDisease;
import com.syjiaer.clinic.server.entity.social.SocialTcmDiseaseCatalogue;
import com.syjiaer.clinic.server.mapper.social.SocialTcmDiseaseCatalogueMapper;
import org.springframework.beans.factory.annotation.Autowired;
@ -46,7 +45,7 @@ public class SocialTcmDiseaseCatalogueService {
queryWrapper.in("social_code", code_list);
socialTcmDiseaseCatalogueMapper.delete(queryWrapper);
socialTcmDiseaseCatalogueMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(type, version_name, list.get(0).getVersionName(), list.size());
socialDirectoryVersionService.saveVersion(type, version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName();
}
}

3
src/main/java/com/syjiaer/clinic/server/service/social/SocialTcmSyndromeService.java
View File

@ -3,7 +3,6 @@ package com.syjiaer.clinic.server.service.social;
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.entity.social.SocialTcmDiseaseCatalogue;
import com.syjiaer.clinic.server.entity.social.SocialTcmSyndrome;
import com.syjiaer.clinic.server.mapper.social.SocialTcmSyndromeMapper;
import org.springframework.beans.factory.annotation.Autowired;
@ -46,7 +45,7 @@ public class SocialTcmSyndromeService {
queryWrapper.in("social_code", code_list);
socialTcmSyndromeMapper.delete(queryWrapper);
socialTcmSyndromeMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(type, version_name, list.get(0).getVersionName(), list.size());
socialDirectoryVersionService.saveVersion(type, version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName();
}
}

95
src/main/resources/doc_title/1305.json
View File

@ -1,108 +1,23 @@
[
{
"10": {
"en": "json.name",
"en": "name",
"zh": "项目名称",
"column_width": 200
"column_width": 400
}
},
{
"1": {
"en": "json.code",
"en": "code",
"zh": "医疗目录编码",
"column_width": 200
"column_width": 400
}
},
{
"2": {
"en": "json.unit",
"en": "unit",
"zh": "计价单位",
"column_width": 200
}
},
{
"3": {
"en": "json.unit_name",
"zh": "单位名称",
"column_width": 200
}
},
{
"6": {
"en": "json.diagnosis_treatment_content",
"zh": "诊疗项目内涵",
"column_width": 300
}
},
{
"4": {
"en": "json.diagnosis_treatment_description",
"zh": "诊疗项目说明",
"column_width": 300
}
},
{
"12": {
"en": "begndate",
"zh": "开始日期",
"column_width": 200
}
},
{
"13": {
"en": "enddate",
"zh": "结束日期",
"column_width": 200
}
},
{
"5": {
"en": "json.diagnosis_treatment_exclusions",
"zh": "诊疗除外内容"
}
},
{
"7": {
"en": "json.valid_flag",
"zh": "有效标志"
}
},
{
"8": {
"en": "json.remarks",
"zh": "备注"
}
},
{
"9": {
"en": "json.service_category",
"zh": "服务项目类别"
}
},
{
"11": {
"en": "json.project_description",
"zh": "项目说明"
}
},
{
"14": {
"en": "json.unique_record_number",
"zh": "唯一记录号"
}
},
{
"15": {
"en": "json.version_number",
"zh": "版本号"
}
},
{
"16": {
"en": "json.version_name",
"zh": "版本名称",
"column_width": 200
}
}
]