|
|
@ -36,7 +36,6 @@ import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
*
|
|
|
* @author yeshijie on 2018/8/17.
|
|
|
*/
|
|
|
@Service
|
|
|
@ -65,55 +64,56 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
|
|
|
private ServicePackageSignRecordDao servicePackageSignRecordDao;
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public JSONObject create(ServicePackageDO servicePackageDO,String uid){
|
|
|
public JSONObject create(ServicePackageDO servicePackageDO, String uid) {
|
|
|
JSONObject result = new JSONObject();
|
|
|
UserDO userDO = userDao.findById(uid);
|
|
|
List<ServicePackageItemDO> itemDOList = servicePackageDO.getPackageItemDOList();
|
|
|
if(itemDOList==null){
|
|
|
if (itemDOList == null) {
|
|
|
servicePackageDO.setNum(0);
|
|
|
}else {
|
|
|
} else {
|
|
|
servicePackageDO.setNum(itemDOList.size());
|
|
|
}
|
|
|
|
|
|
if(StringUtil.isEmpty(servicePackageDO.getId())){
|
|
|
if (StringUtil.isEmpty(servicePackageDO.getId())) {
|
|
|
//新增
|
|
|
servicePackageDO.setCreateTime(new Date());
|
|
|
if(userDO!=null){
|
|
|
if (userDO != null) {
|
|
|
servicePackageDO.setCreateUser(userDO.getId());
|
|
|
servicePackageDO.setCreateUserName(userDO.getName());
|
|
|
}
|
|
|
servicePackageDO=servicePackageDao.save(servicePackageDO);
|
|
|
}else{
|
|
|
servicePackageDO = servicePackageDao.save(servicePackageDO);
|
|
|
} else {
|
|
|
//修改
|
|
|
servicePackageDO.setUpdateTime(new Date());
|
|
|
if(userDO!=null){
|
|
|
if (userDO != null) {
|
|
|
servicePackageDO.setUpdateUser(userDO.getId());
|
|
|
servicePackageDO.setUpdateUserName(userDO.getName());
|
|
|
}
|
|
|
servicePackageDO= servicePackageDao.save(servicePackageDO);
|
|
|
servicePackageDO = servicePackageDao.save(servicePackageDO);
|
|
|
}
|
|
|
List<ServiceItemConfig> itemConfigList = new ArrayList<>();
|
|
|
String sql = " SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'plan_frequency' limit 1";
|
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
|
List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
|
|
|
String frequencyCode = "0 0 10 ? * *";
|
|
|
if(list.size()>0){
|
|
|
frequencyCode = list.get(0).get("dict_code")+"";
|
|
|
if (list.size() > 0) {
|
|
|
frequencyCode = list.get(0).get("dict_code") + "";
|
|
|
}
|
|
|
for (ServicePackageItemDO itemDO:itemDOList){
|
|
|
for (ServicePackageItemDO itemDO : itemDOList) {
|
|
|
boolean flag = false;
|
|
|
ServicePackageItemDO itemDO1 = new ServicePackageItemDO();
|
|
|
if(StringUtils.isNotBlank(itemDO.getId())){
|
|
|
if (StringUtils.isNotBlank(itemDO.getId())) {
|
|
|
itemDO1 = servicePackageItemDao.findOne(itemDO.getId());
|
|
|
}
|
|
|
if("system".equals(itemDO1.getServicePackageId())){
|
|
|
if ("system".equals(itemDO1.getServicePackageId())) {
|
|
|
flag = true;
|
|
|
BeanUtils.copyProperties(itemDO1,itemDO);
|
|
|
BeanUtils.copyProperties(itemDO1, itemDO);
|
|
|
itemDO.setId(null);
|
|
|
itemDO.setCreateTime(DateUtil.getStringDate());
|
|
|
// itemDO.setServicePackageItemId(itemDO1.getId());//20231110补的
|
|
|
itemDO.setServicePackageId(servicePackageDO.getId());
|
|
|
}
|
|
|
servicePackageItemDao.save(itemDO);
|
|
|
if(flag){
|
|
|
if (flag) {
|
|
|
String itemId = itemDO.getId();
|
|
|
//新增的服务项新增默认执行计划
|
|
|
ServiceItemConfig itemConfig = new ServiceItemConfig();
|
|
|
@ -131,12 +131,12 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if(itemConfigList.size()>0){
|
|
|
if (itemConfigList.size() > 0) {
|
|
|
itemConfigDao.save(itemConfigList);
|
|
|
}
|
|
|
|
|
|
result.put("response", ConstantUtils.SUCCESS);
|
|
|
result.put("msg","操作成功");
|
|
|
result.put("msg", "操作成功");
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
@ -166,29 +166,29 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
|
|
|
String pageSql = " limit " + (page - 1) * size + "," + size;
|
|
|
detailSql += sql + pageSql;
|
|
|
countSql += sql;
|
|
|
List<ServicePackageDO> list = jdbcTemplate.query(detailSql,new BeanPropertyRowMapper<>(ServicePackageDO.class));
|
|
|
List<ServicePackageDO> list = jdbcTemplate.query(detailSql, new BeanPropertyRowMapper<>(ServicePackageDO.class));
|
|
|
List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOS = wlyyHospitalSysDictDao.findByDictName("serviceType");
|
|
|
List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOS1 = wlyyHospitalSysDictDao.findByDictName("isEffect");
|
|
|
for (ServicePackageDO servicePackageDO:list){
|
|
|
for (ServicePackageDO servicePackageDO : list) {
|
|
|
List<ServicePackageItemDO> itemDOList = servicePackageItemDao.findByServicePackageId(servicePackageDO.getId());
|
|
|
List<String> orgNames = itemDOList.stream().map(p -> p.getOrgName()).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
|
|
|
List<String> orgCodes = itemDOList.stream().map(p -> p.getOrgCode()).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
|
|
|
servicePackageDO.setOrgNames(StringUtils.join(orgNames,","));
|
|
|
servicePackageDO.setOrgCodes(StringUtils.join(orgCodes,","));
|
|
|
for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:wlyyHospitalSysDictDOS){
|
|
|
if (servicePackageDO.getType().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
|
|
|
servicePackageDO.setOrgNames(StringUtils.join(orgNames, ","));
|
|
|
servicePackageDO.setOrgCodes(StringUtils.join(orgCodes, ","));
|
|
|
for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO : wlyyHospitalSysDictDOS) {
|
|
|
if (servicePackageDO.getType().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())) {
|
|
|
servicePackageDO.setTypeName(wlyyHospitalSysDictDO.getDictValue());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:wlyyHospitalSysDictDOS1){
|
|
|
if (servicePackageDO.getDel().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
|
|
|
for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO : wlyyHospitalSysDictDOS1) {
|
|
|
if (servicePackageDO.getDel().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())) {
|
|
|
servicePackageDO.setDelName(wlyyHospitalSysDictDO.getDictValue());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
Long count = jdbcTemplate.queryForObject(countSql, Long.class);
|
|
|
return PageEnvelop.getSuccessListWithPage("获取成功",list,page,size,count);
|
|
|
return PageEnvelop.getSuccessListWithPage("获取成功", list, page, size, count);
|
|
|
}
|
|
|
|
|
|
public void deleteById(String id) {
|
|
|
@ -209,11 +209,11 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
|
|
|
jdbcTemplate.execute(sql01);
|
|
|
}
|
|
|
|
|
|
public void changeState(String id,String del,String uid) {
|
|
|
public void changeState(String id, String del, String uid) {
|
|
|
ServicePackageDO packageDO = servicePackageDao.findOne(id);
|
|
|
packageDO.setDel(del);
|
|
|
UserDO userDO = userDao.findById(uid);
|
|
|
if(userDO!=null){
|
|
|
if (userDO != null) {
|
|
|
packageDO.setUpdateUser(userDO.getId());
|
|
|
packageDO.setUpdateUserName(userDO.getName());
|
|
|
}
|
suqinyi