|
@@ -4,19 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.diagbot.dto.LisConfigDTO;
|
|
|
import com.diagbot.dto.TemplateInfoDTO;
|
|
|
import com.diagbot.dto.TemplateInfoPageAllDTO;
|
|
|
import com.diagbot.dto.TemplateInfoPageDTO;
|
|
|
import com.diagbot.entity.TemplateInfo;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
+import com.diagbot.enums.TemplateTypeEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.service.impl.TemplateInfoServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.DateUtil;
|
|
|
-import com.diagbot.util.EnDecodeUtil;
|
|
|
-import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.GsonUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.vo.TemplateIdVO;
|
|
@@ -91,7 +89,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
|
|
|
templateInfoAmind
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("id", templateInfoRevampVO.getId())
|
|
|
- .eq("template_type", 1);
|
|
|
+ .eq("template_type", TemplateTypeEnum.PersonalTemplate.getKey());
|
|
|
int sumA = count(templateInfoAmind);
|
|
|
if (sumA == 0) {
|
|
|
throw new CommonException(CommonErrorCode.NOT_EXISTS, "标准模板无权修改");
|
|
@@ -103,7 +101,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
|
|
|
mapAll.put("doctor_id", templateInfoRevampVO.getDoctorId());
|
|
|
mapAll.put("hospital_id", templateInfoRevampVO.getHospitalId());
|
|
|
mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
- mapAll.put("template_type", 1);
|
|
|
+ mapAll.put("template_type", TemplateTypeEnum.PersonalTemplate.getKey());
|
|
|
mapAll.put("name", templateInfoRevampVO.getModeName());
|
|
|
//mapAll.put("type", templateInfoRevampVO.getType());
|
|
|
templates.allEq(mapAll);
|
|
@@ -139,7 +137,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
|
|
|
mapAll.put("doctor_id", templateInfosVO.getDoctorId());
|
|
|
mapAll.put("hospital_id", templateInfosVO.getHospitalId());
|
|
|
mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
- mapAll.put("template_type",templateInfosVO.getTemplateType());
|
|
|
+ mapAll.put("template_type", templateInfosVO.getTemplateType());
|
|
|
mapAll.put("name", templateInfosVO.getModeName());
|
|
|
//mapAll.put("type", templateInfosVO.getModeType());
|
|
|
|
|
@@ -191,7 +189,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
|
|
|
templateInfoNew
|
|
|
.in("id", ListUtil.arrayToList(splitIds))
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
- .eq("template_type",1)
|
|
|
+ .eq("template_type", TemplateTypeEnum.PersonalTemplate.getKey())
|
|
|
.set("is_deleted", IsDeleteEnum.Y.getKey())
|
|
|
//.set("modifier",UserUtils.getCurrentPrincipleID())
|
|
|
.set("gmt_modified", DateUtil.now());
|
|
@@ -209,14 +207,14 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
|
|
|
TemplateInfoPageAllDTO data = new TemplateInfoPageAllDTO();
|
|
|
//取出个人模板
|
|
|
TemplateInfoTypeVO personalVO = new TemplateInfoTypeVO();
|
|
|
- BeanUtil.copyProperties(templateInfoPageVO,personalVO);
|
|
|
- personalVO.setTemplateType(1);
|
|
|
+ BeanUtil.copyProperties(templateInfoPageVO, personalVO);
|
|
|
+ personalVO.setTemplateType(TemplateTypeEnum.PersonalTemplate.getKey());
|
|
|
IPage<TemplateInfoPageDTO> personalTemplate = getTemplatePages(personalVO);
|
|
|
data.setPersonalTemplate(personalTemplate);
|
|
|
//取出标准模板
|
|
|
TemplateInfoTypeVO adminVO = new TemplateInfoTypeVO();
|
|
|
- BeanUtil.copyProperties(templateInfoPageVO,adminVO);
|
|
|
- adminVO.setTemplateType(2);
|
|
|
+ BeanUtil.copyProperties(templateInfoPageVO, adminVO);
|
|
|
+ adminVO.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());
|
|
|
IPage<TemplateInfoPageDTO> adminTemplate = getTemplatePages(adminVO);
|
|
|
data.setAdminTemplate(adminTemplate);
|
|
|
|