diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/BasicConfigContainer.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/BasicConfigContainer.java new file mode 100644 index 0000000..e1a61ff --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/BasicConfigContainer.java @@ -0,0 +1,43 @@ +package com.lyms.platform.permission; + +import com.lyms.platform.pojo.BasicConfig; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author: litao + * @Date: 2017/5/15 0015 15:18 + * @Version: V1.0 + */ +@Configuration +public class BasicConfigContainer { + + @Autowired + private MongoTemplate mongoTemplate; + + private static final String DEFAULT_PARENT_KEY = "parentId"; + private static final String ENABLE_KEY = "enable"; + + public List> getValuesByPid(String value) { + List configs = mongoTemplate.find(Query.query(Criteria.where(DEFAULT_PARENT_KEY).is(value).and(ENABLE_KEY).is(1)), BasicConfig.class); + if(CollectionUtils.isNotEmpty(configs)) { + List> restMap = new ArrayList<>(); + for (BasicConfig config : configs) { + Map temp = new HashMap<>(); + temp.put("id", config.getId()); + temp.put("value", config.getName()); + } + } + return null; + } + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index db44108..3db1900 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -29,4 +29,8 @@ public interface CouponMapper { Set findTypes(Map param); void update(Map param); + + List> findOrgUsers(String hospitalId); + + List> findOrgAreas(String hospitalId); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index 2b0326a..adf69ae 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -26,4 +26,8 @@ public interface CouponService{ Map getPatientsInfoByCode(String code); void del(String userId, String hospitalId, String delUserId); + + BaseObjectResponse doctors(String hospitalId); + + BaseObjectResponse areas(String hospitalId); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java index 9e0f40e..995eafa 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.enums.FmTypeEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.EnumUtil; +import com.lyms.platform.permission.BasicConfigContainer; import com.lyms.platform.permission.dao.master.BabyPatientExtendEarMapper; import com.lyms.platform.permission.model.BabyPatientExtendEar; import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; @@ -31,6 +32,9 @@ public class BabyPatientExtendEarServiceImpl implements BabyPatientExtendEarServ @Autowired private BabyPatientExtendEarMapper earMapper; + @Autowired + private BasicConfigContainer configContainer; + @Override public BaseObjectResponse insert(BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, Integer userId) { diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 6b34762..1b60ab1 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -68,6 +68,7 @@ public class CouponServiceImpl implements CouponService { @Autowired private OrganizationService organizationService; + /** * 生成规则： * 孕妇 建档、产检、分娩、出院小结、产后复查 @@ -311,6 +312,16 @@ public class CouponServiceImpl implements CouponService { couponMapper.update(param); } + @Override + public BaseObjectResponse doctors(String hospitalId) { + return RespBuilder.buildSuccess(couponMapper.findOrgUsers(hospitalId)); + } + + @Override + public BaseObjectResponse areas(String hospitalId) { + return RespBuilder.buildSuccess(couponMapper.findOrgAreas(hospitalId)); + } + /** 1=省 2=市 3=区 4=单医院 */ private boolean validateArea(String areaType, String createHospitalId, String useHospitald) { Organization createHospital = organizationService.getOrganization(Integer.parseInt(createHospitalId)); diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index d749d24..ffdd4b6 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -59,9 +59,9 @@ @@ -90,4 +90,16 @@ where a.hospital_id = #{hospitalId} and a.coupon_template_group_id = b.group_id and b.type_id = c.id + + + + \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/BasicConfigUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/BasicConfigUtil.java deleted file mode 100644 index 2fc6368..0000000 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/BasicConfigUtil.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lyms.platform.common.utils; - -/** - * @Author: litao - * @Date: 2017/5/15 0015 15:18 - * @Version: V1.0 - */ -public class BasicConfigUtil { -} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java index 69e14fa..65224f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java @@ -84,5 +84,28 @@ public class CouponController extends BaseController { return couponService.use(code, hospitalId, loginState.getId()); } + /** + * 获取当前登陆医生所属医院的所有人员 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/doctors") + @TokenRequired + @ResponseBody + public BaseObjectResponse doctors(HttpServletRequest request) { + return couponService.doctors(autoMatchFacade.getHospitalId(getUserId(request))); + } + + /** + * 获取当前登陆医生所属医院的所有配置了的区域 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/areas") + @TokenRequired + @ResponseBody + public BaseObjectResponse areas(HttpServletRequest request) { + return couponService.areas(autoMatchFacade.getHospitalId(getUserId(request))); + } }