|
|
@ -11,7 +11,6 @@ import com.yihu.jw.base.util.ConstantUtils;
|
|
|
import com.yihu.jw.entity.base.servicePackage.ServiceItemConfig;
|
|
|
import com.yihu.jw.entity.base.servicePackage.ServicePackageDO;
|
|
|
import com.yihu.jw.entity.base.servicePackage.ServicePackageItemDO;
|
|
|
import com.yihu.jw.entity.base.system.SystemDictEntryDO;
|
|
|
import com.yihu.jw.entity.base.user.UserDO;
|
|
|
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
|
|
|
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
|
|
|
@ -24,6 +23,7 @@ import com.yihu.mysql.query.BaseJpaService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@ -104,26 +104,20 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
|
|
|
ServicePackageItemDO itemDO1 = new ServicePackageItemDO();
|
|
|
if(StringUtils.isNotBlank(itemDO.getId())){
|
|
|
itemDO1 = servicePackageItemDao.findOne(itemDO.getId());
|
|
|
}else {
|
|
|
}
|
|
|
if("system".equals(itemDO1.getServicePackageId())){
|
|
|
flag = true;
|
|
|
itemDO1 = itemDO;
|
|
|
itemDO1.setCreateTime(DateUtil.getStringDate());
|
|
|
SystemDictEntryDO systemDictEntryDO = systemDictEntryDao.findByDictCodeAndCode("service_item",itemDO.getCode());
|
|
|
if (systemDictEntryDO!=null){
|
|
|
if (StringUtils.isNotBlank(systemDictEntryDO.getRemark())){//服务项所属专题不为空
|
|
|
itemDO1.setTopicItem(systemDictEntryDO.getRemark());
|
|
|
}
|
|
|
}
|
|
|
BeanUtils.copyProperties(itemDO1,itemDO);
|
|
|
itemDO.setId(null);
|
|
|
itemDO.setCreateTime(DateUtil.getStringDate());
|
|
|
itemDO.setServicePackageId(servicePackageDO.getId());
|
|
|
}
|
|
|
|
|
|
itemDO1.setDictId(itemDO.getId());
|
|
|
itemDO1.setServicePackageId(servicePackageDO.getId());
|
|
|
servicePackageItemDao.save(itemDO1);
|
|
|
servicePackageItemDao.save(itemDO);
|
|
|
if(flag){
|
|
|
String itemId = itemDO1.getId();
|
|
|
String itemId = itemDO.getId();
|
|
|
//新增的服务项新增默认执行计划
|
|
|
ServiceItemConfig itemConfig = new ServiceItemConfig();
|
|
|
itemConfig.setPackageId(itemDO1.getServicePackageId());
|
|
|
itemConfig.setPackageId(servicePackageDO.getId());
|
|
|
itemConfig.setServerItemId(itemId);
|
|
|
itemConfig.setAssessType("0");
|
|
|
itemConfig.setBookingType("1");
|
