云照护修改

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServiceItemConfig.java

@@ -40,7 +40,7 @@ public class ServiceItemConfig extends UuidIdentityEntity implements java.io.Ser
    private String serverCount;//服务次数
    @Column(name = "template_type")
    private String templateType;//模板的类型-目前是随访为1
    private String templateType;//模板的类型-目前是随访为1 0手动配置
    @Column(name = "template_code")
    private String templateCode;//对应模板的id

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageService.java

@@ -1,12 +1,14 @@
package com.yihu.jw.base.service.servicePackage;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.servicePackage.ServiceItemConfigDao;
import com.yihu.jw.base.dao.servicePackage.ServicePackageDao;
import com.yihu.jw.base.dao.servicePackage.ServicePackageItemDao;
import com.yihu.jw.base.dao.servicePackage.ServicePackageSignRecordDao;
import com.yihu.jw.base.dao.system.SystemDictEntryDao;
import com.yihu.jw.base.dao.team.BaseTeamDao;
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;
@@ -57,7 +59,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    private SystemDictEntryDao systemDictEntryDao;
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    private ServiceItemConfigDao itemConfigDao;
    @Autowired
    private ServicePackageSignRecordDao servicePackageSignRecordDao;
@@ -89,12 +92,20 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            }
            servicePackageDO= servicePackageDao.save(servicePackageDO);
        }
        List<ServicePackageItemDO> itemDOs = new ArrayList<>();
        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);
        String frequencyCode = "0 0 10 ? * *";
        if(list.size()>0){
            frequencyCode = list.get(0).get("dict_code")+"";
        }
        for (ServicePackageItemDO itemDO:itemDOList){
            boolean flag = false;
            ServicePackageItemDO itemDO1 = new ServicePackageItemDO();
            if(StringUtils.isNotBlank(itemDO.getId())){
                itemDO1 = servicePackageItemDao.findOne(itemDO.getId());
            }else {
                flag = true;
                itemDO1 = itemDO;
                itemDO1.setCreateTime(DateUtil.getStringDate());
                SystemDictEntryDO systemDictEntryDO = systemDictEntryDao.findByDictCodeAndCode("service_item",itemDO.getCode());
@@ -107,9 +118,28 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            itemDO1.setDictId(itemDO.getId());
            itemDO1.setServicePackageId(servicePackageDO.getId());
            itemDOs.add(itemDO1);
            servicePackageItemDao.save(itemDO1);
            if(flag){
                String itemId = itemDO1.getId();
                //新增的服务项新增默认执行计划
                ServiceItemConfig itemConfig = new ServiceItemConfig();
                itemConfig.setPackageId(itemDO1.getServicePackageId());
                itemConfig.setServerItemId(itemId);
                itemConfig.setAssessType("0");
                itemConfig.setBookingType("1");
                itemConfig.setLateServeType("0");
                itemConfig.setServerCount("1");
                itemConfig.setPlanStartTimeType("0");
                itemConfig.setServerTimeType("1");
                itemConfig.setFrequencyCode(frequencyCode);
                itemConfig.setTemplateType("0");
                itemConfigList.add(itemConfig);
            }
        }
        if(itemConfigList.size()>0){
            itemConfigDao.save(itemConfigList);
        }
        servicePackageItemDao.save(itemDOs);
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg","操作成功");