diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Doctor.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Doctor.java similarity index 65% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Doctor.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Doctor.java index ecd8b39e..a4684b7b 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Doctor.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Doctor.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.api.entity; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,51 +8,59 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.io.Serializable; - /** - * @Author: TangSheng - * @Description: 医生 - * @Since 1.0 - * @Date Created in 11:54 2022/4/21 + *

+ * 医生实体类 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName(value="sys_doctor") -public class Doctor extends CommonEntity implements Serializable { +@TableName(value="common_doctor") +public class Doctor extends CommonEntity { - private static final long serialVersionUID = 6897720098338460586L; + private static final long serialVersionUID = 1L; - /**医生ID*/ @TableId private String id; + /**医生姓名*/ private String name; + /**医生职称*/ private String title; + /**医生性别*/ private String sex; + /**医生电话*/ private String phone; + /**医生邮箱*/ private String email; + /**地址（门牌号）*/ private String detailAddress; + /**组织类型*/ - private String organType; + private String orgType; + /**组织id*/ - private String organId; + private String orgId; + /**组织名称*/ - private String organName; + private String orgName; + /**科室ID*/ private String officeId; + /**科室名称*/ private String officeName; + /**医生状态*/ private String status; - @TableField(exist = false) - private String otherId; - } diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Institution.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Hospital.java similarity index 50% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Institution.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Hospital.java index 22fc14f7..5fa22985 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Institution.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Hospital.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.api.entity; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,20 +8,23 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.io.Serializable; +import java.math.BigDecimal; /** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 10:50 2022/6/9 + *

+ * 医院管理实体 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/26 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName(value="sys_institution") -public class Institution extends CommonEntity implements Serializable{ - private static final long serialVersionUID = 6481437030667115170L; +@TableName(value="common_hospital") +public class Hospital extends CommonEntity { + + private static final long serialVersionUID = 1L; @TableId private String id; @@ -30,22 +33,29 @@ public class Institution extends CommonEntity implements Serializable{ private String type; - private String contactsName; + private String contactName; - private String contactsTel; + private String contactPhone; - private String contactsTitle; + private String contactTitle; - /**地址id数组字符串*/ - private String addressIds; + private String payment; - /**地址name数组字符串*/ - private String addressNames; + private String addressIds; private String detailAddress; private String status; + private Integer mapOrientation; + + private BigDecimal mapLng; + + private BigDecimal mapLat; + + private String mapNotify; + @TableField(exist = false) - private String otherId; + private String[] orgIds; + } diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Office.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Office.java similarity index 51% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Office.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Office.java index 735e360e..3cdfebdb 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Office.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Office.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.api.entity; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,39 +11,38 @@ import lombok.experimental.Accessors; import java.io.Serializable; /** - * @Author: TangSheng - * @Description: 科室 - * @Since 1.0 - * @Date Created in 13:54 2022/4/21 + *

+ * 科室 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/26 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName(value="sys_office") -public class Office extends CommonEntity implements Serializable { +@TableName(value="common_office") +public class Office extends CommonEntity { - private static final long serialVersionUID = -7415141113272373249L; + private static final long serialVersionUID = 1L; @TableId private String id; private String name; - private String organType; + private String orgType; - private String organId; + private String orgId; - private String organName; + private String orgName; - private String directorName; + private String manageName; - private String directorTel; + private String managePhone; private String detailAddress; private String status; - @TableField(exist = false) - private String otherId; - -} \ No newline at end of file +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java new file mode 100644 index 00000000..7b9ae5c0 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java @@ -0,0 +1,53 @@ +package com.cloud.kicc.commonbiz.api.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.CommonEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + *

+ * 上级医检机构实体 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value="common_org") +public class Org extends CommonEntity { + + @TableId + private String id; + + private String name; + + private String type; + + private String contactName; + + private String contactPhone; + + private String contactTitle; + + private String addressIds; + + private String addressNames; + + private String detailAddress; + + private String status; + + private Integer mapOrientation; + + private BigDecimal mapLng; + + private BigDecimal mapLat; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/OrgHospital.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/OrgHospital.java new file mode 100644 index 00000000..38162874 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/OrgHospital.java @@ -0,0 +1,27 @@ +package com.cloud.kicc.commonbiz.api.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import java.io.Serializable; + +/** + *

+ * 上级医检机构与下级医院管理表 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value="common_org_hospital") +public class OrgHospital implements Serializable { + + private String orgId; + + private String hospitalId; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Project.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Project.java new file mode 100644 index 00000000..87cc0c3a --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Project.java @@ -0,0 +1,55 @@ +package com.cloud.kicc.commonbiz.api.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.TreeEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 项目表 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "common_project") +public class Project extends TreeEntity { + + private static final long serialVersionUID = 1L; + + /** + * 机构编码 + */ + private String code; + + /** + * 联系人 + */ + private String contact; + + /** + * 联系电话 + */ + private String phone; + + /** + * 联系地址 + */ + private String address; + + /** + * 联系邮箱 + */ + private String email; + + /** + * 部门状态（0正常 1停用） + */ + private String status; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java deleted file mode 100644 index a82f8bf5..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cloud.kicc.system.api.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: TangSheng - * @Description: 医院管理实体 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName(value="sys_hospital") -public class Hospital extends CommonEntity implements Serializable { - - private static final long serialVersionUID = -7944080375255485489L; - - @TableId - private String id; - - private String name; - - private String type; - - private String contactsName; - - private String contactsTel; - - private String contactsTitle; - - private String payment; - - private String addressIds; - - private String detailAddress; - - private String status; - - @TableField(exist = false) - private String[] institutionIds; - - @TableField(exist = false) - private List institutionList = new ArrayList<>(); - - @TableField(exist = false) - private String otherId; - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/InstitutionRelation.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/InstitutionRelation.java deleted file mode 100644 index b1fd6041..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/InstitutionRelation.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cloud.kicc.system.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Author: TangSheng - * @Description: 机构关联医院 - * @Since 1.0 - * @Date Created in 11:05 2022/4/25 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName(value="sys_institution_relation") -public class InstitutionRelation extends BaseEntity { - - @TableId - private String id; - - private String institutionId; - - private String hospitalId; - - - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Project.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Project.java deleted file mode 100644 index 8f9612d3..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Project.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.cloud.kicc.system.api.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 部门表 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName(value = "sys_project", excludeProperty = { "tenantId" }) -public class Project extends CommonEntity { - - private static final long serialVersionUID = 1L; - - /** - * 部门id - */ - @TableId - private String projectId; - - /** - * 机构编码 - */ - private String code; - - /** - * 机构名称 - */ - private String name; - - /** - * 父部门id - */ - private String parentId; - - /** - * 显示顺序 - */ - private Integer sort; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String phone; - - /** - * 联系地址 - */ - private String address; - - /** - * 联系邮箱 - */ - private String email; - - /** - * 部门状态（0正常 1停用） - */ - private String status; - - /** - * 子菜单 - */ - @TableField(exist = false) - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children = new ArrayList(); -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DoctorController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DoctorController.java similarity index 54% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DoctorController.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DoctorController.java index 980bffdf..80106642 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DoctorController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DoctorController.java @@ -1,98 +1,71 @@ -package com.cloud.kicc.system.controller; +package com.cloud.kicc.commonbiz.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.system.api.entity.Doctor; -import com.cloud.kicc.system.api.entity.Project; -import com.cloud.kicc.system.service.DoctorService; +import com.cloud.kicc.commonbiz.service.DoctorService; +import com.cloud.kicc.commonbiz.api.entity.Doctor; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.Arrays; -import java.util.List; /** - * @Author: TangSheng - * @Description: 医生api - * @Since 1.0 - * @Date Created in 14:15 2022/4/21 + *

+ * 医生前端控制器 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/23 */ @RestController @RequiredArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/doctor") +@RequestMapping(AppConstants.APP_COMMON + "/doctor") @Api(value = "app", tags = "医生管理模块") public class DoctorController { private final DoctorService doctorService; - /** - * 查询根据id - * @param id - * @return - */ - @GetMapping("/{id}") - public R queryById(@PathVariable String id) { - return R.ok(doctorService.getById(id)); + private LambdaQueryWrapper getQueryWrapper(Doctor doctor) { + return Wrappers.lambdaQuery() + .like(StrUtil.isNotBlank(doctor.getName()), Doctor::getName, doctor.getName()) + .eq(StrUtil.isNotBlank(doctor.getOrgType()), Doctor::getOrgType, doctor.getOrgType()) + .between(StrUtil.isNotBlank(doctor.getBeginTime()) && StrUtil.isNotBlank(doctor.getEndTime()), Doctor::getCreateTime, doctor.getBeginTime(), doctor.getEndTime()) + .orderByAsc(Doctor::getId); } - /** - * 分页条件查询 - * @param - * @param doctor - * @return - */ @GetMapping("/list") - public R list(Doctor doctor) { - List result = doctorService.list(getQueryWrapper(doctor)); - return R.ok(result, result.size()); + public R list(Page page, Doctor doctor) { + IPage result = doctorService.page(page, getQueryWrapper(doctor)); + return R.ok(result.getRecords(), result.getTotal()); } - /** - * 新增 - * @param doctor - * @return - */ - @PostMapping("/add") + @GetMapping("/{id}") + public R getById(@PathVariable String id) { + return R.ok(doctorService.getById(id)); + } + + @PostMapping("/save") public R add(@RequestBody Doctor doctor) { doctorService.save(doctor); return R.ok(); } - /** - * 修改 - * @param doctor - * @return - */ @PutMapping("/update") public R update(@RequestBody Doctor doctor) { doctorService.updateById(doctor); return R.ok(); } - /** - * 删除 - * @param id - * @return - */ - @DeleteMapping("/remove/{id:[\\w,]+}") - public R remove(@PathVariable("id") String[] id){ - doctorService.removeByIds(Arrays.asList(id)); + @DeleteMapping("/remove/{ids:[\\w,]+}") + public R remove(@PathVariable String[] ids) { + doctorService.removeByIds(Arrays.asList(ids)); return R.ok(); } - - private LambdaQueryWrapper getQueryWrapper(Doctor doctor) { - return Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(doctor.getName()), Doctor::getName, doctor.getName()) - .eq(StrUtil.isNotBlank(doctor.getOrganType()),Doctor::getOrganType,doctor.getOrganType()) - .between(StrUtil.isNotBlank(doctor.getBeginTime()) && StrUtil.isNotBlank(doctor.getEndTime()), Doctor::getCreateTime, doctor.getBeginTime(), doctor.getEndTime()) - .orderByAsc(Doctor::getId); - } - -} \ No newline at end of file +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/HospitalController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/HospitalController.java new file mode 100644 index 00000000..305b650d --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/HospitalController.java @@ -0,0 +1,83 @@ +package com.cloud.kicc.commonbiz.controller; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.commonbiz.api.entity.Hospital; +import com.cloud.kicc.commonbiz.api.entity.OrgHospital; +import com.cloud.kicc.commonbiz.service.HospitalService; +import com.cloud.kicc.commonbiz.service.OrgHospitalService; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + *

+ * 医院前端控制器 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/23 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping(AppConstants.APP_COMMON + "/hospital") +@Api(value = "app", tags = "医院管理模块") +public class HospitalController { + + private final HospitalService hospitalService; + + private final OrgHospitalService orgHospitalService; + + private LambdaQueryWrapper getQueryWrapper(Hospital hospital) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(hospital.getName()), Hospital::getName, hospital.getName()) + .eq(StrUtil.isNotBlank(hospital.getType()), Hospital::getType, hospital.getType()) + .between(StrUtil.isNotBlank(hospital.getBeginTime()) && StrUtil.isNotBlank(hospital.getEndTime()), Hospital::getCreateTime, hospital.getBeginTime(), hospital.getEndTime()) + .orderByAsc(Hospital::getCreateTime); + } + + @GetMapping("/list") + public R list(Page page, Hospital hospital) { + IPage result = hospitalService.page(page, getQueryWrapper(hospital)); + return R.ok(result.getRecords(), result.getTotal()); + } + + @GetMapping("/{id:\\w+}") + public R getById(@PathVariable("id") String id) { + Hospital hospital = hospitalService.getById(id); + if(hospital !=null){ + List orgIds = orgHospitalService.list(new LambdaQueryWrapper().eq(OrgHospital::getHospitalId, hospital.getId())) + .stream().map(item -> item.getOrgId()).collect(Collectors.toList()); + hospital.setOrgIds(ArrayUtil.toArray(orgIds, String.class)); + } + return R.ok(hospital); + } + + @PostMapping("/save") + public R save(@RequestBody Hospital hospital) { + hospitalService.insertHospital(hospital); + return R.ok(); + } + + @PutMapping("/update") + public R update(@RequestBody Hospital hospital){ + hospitalService.updateHospital(hospital); + return R.ok(); + } + + @DeleteMapping("/remove/{ids:[\\w,]+}") + public R remove(@PathVariable String[] ids) { + hospitalService.removeByIds(Arrays.asList(ids)); + return R.ok(); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OfficeController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OfficeController.java new file mode 100644 index 00000000..fdd10941 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OfficeController.java @@ -0,0 +1,73 @@ +package com.cloud.kicc.commonbiz.controller; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.commonbiz.api.entity.Office; +import com.cloud.kicc.commonbiz.service.OfficeService; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + + +/** + *

+ * 科室前端控制器 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping(AppConstants.APP_COMMON + "/office") +@Api(value = "app", tags = "科室管理模块") +public class OfficeController { + + private final OfficeService officeService; + + private LambdaQueryWrapper getQueryWrapper(Office office) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(office.getName()), Office::getName, office.getName()) + .eq(StrUtil.isNotBlank(office.getOrgType()), Office::getOrgType, office.getOrgType()) + .between(StrUtil.isAllNotBlank(office.getBeginTime(),office.getEndTime()),Office::getCreateTime, office.getBeginTime(), office.getEndTime()) + .orderByAsc(Office::getId); + } + + @GetMapping("/list") + public R list(Page page, Office office) { + IPage result = officeService.page(page, getQueryWrapper(office)); + return R.ok(result.getRecords(), result.getTotal()); + } + + @GetMapping("/{id}") + public R getById(@PathVariable String id) { + return R.ok(officeService.getById(id)); + } + + @PostMapping("/save") + public R save(@RequestBody Office office) { + officeService.save(office); + return R.ok(); + } + + @PutMapping("/update") + public R update(@RequestBody Office office) { + officeService.updateById(office); + return R.ok(); + } + + @DeleteMapping("/remove/{ids:[\\w,]+}") + public R remove(@PathVariable String[] ids){ + officeService.removeByIds(Arrays.asList(ids)); + return R.ok(); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OrgController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OrgController.java new file mode 100644 index 00000000..6f9b0e9b --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OrgController.java @@ -0,0 +1,71 @@ +package com.cloud.kicc.commonbiz.controller; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.commonbiz.api.entity.Org; +import com.cloud.kicc.commonbiz.service.OrgService; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +/** + *

+ * 上级医检前端控制器 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping(AppConstants.APP_COMMON + "/org") +@Api(value = "app", tags = "机构管理模块") +public class OrgController { + + private final OrgService orgService; + + private LambdaQueryWrapper getQueryWrapper(Org org) { + return Wrappers.lambdaQuery() + .like(StrUtil.isNotBlank(org.getName()), Org::getName, org.getName()) + .eq(StrUtil.isNotBlank(org.getType()), Org::getType, org.getType()) + .between(StrUtil.isAllNotBlank(org.getBeginTime(), org.getEndTime()), Org::getCreateTime, org.getBeginTime(), org.getEndTime()) + .orderByAsc(Org::getId); + } + + @GetMapping("/list") + public R list(Page page, Org org) { + IPage result = orgService.page(page, getQueryWrapper(org)); + return R.ok(result.getRecords(), result.getTotal()); + } + + @GetMapping("{id}") + public R getById(@PathVariable String id) { + return R.ok(orgService.getById(id)); + } + + @PostMapping("/save") + public R save(@RequestBody Org org) { + orgService.save(org); + return R.ok(); + } + + @PutMapping("/update") + public R update(@RequestBody Org org) { + orgService.updateById(org); + return R.ok(); + } + + @DeleteMapping("/remove/{ids:[\\w,]+}") + public R remove(@PathVariable String[] ids) { + orgService.removeByIds(Arrays.asList(ids)); + return R.ok(); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/ProjectController.java similarity index 52% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectController.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/ProjectController.java index 4a2a073c..802822bd 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/ProjectController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.controller; +package com.cloud.kicc.commonbiz.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -6,33 +6,28 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; -import com.cloud.kicc.system.api.entity.Dept; -import com.cloud.kicc.system.api.entity.Project; -import com.cloud.kicc.system.api.entity.User; -import com.cloud.kicc.system.service.ProjectService; -import com.cloud.kicc.system.service.UserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import com.cloud.kicc.commonbiz.api.entity.Project; +import com.cloud.kicc.commonbiz.service.ProjectService; import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 14:34 2022/6/7 - * 项目信息 + *

+ * 项目前端控制器 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 */ - @RestController @AllArgsConstructor @RequestMapping(AppConstants.APP_SYSTEM + "/project") public class ProjectController { + private final ProjectService projectService; - private final UserService userService; + private LambdaQueryWrapper getQueryWrapper(Project project) { return Wrappers.lambdaQuery() .like(StrUtil.isNotBlank(project.getName()), Project::getName, project.getName()) @@ -40,21 +35,19 @@ public class ProjectController { .between(StrUtil.isNotBlank(project.getBeginTime()) && StrUtil.isNotBlank(project.getEndTime()), Project::getCreateTime, project.getBeginTime(), project.getEndTime()) .orderByAsc(Project::getSort); } + @GetMapping("/list") - //@PreAuthorize("@pms.hasPermission('project_view')") public R list(Project project) { List projectList = projectService.list(getQueryWrapper(project)); return R.ok(projectList, projectList.size()); } @GetMapping("/{id:\\w+}") - public R getById(@PathVariable("id") String id) { + public R getById(@PathVariable String id) { return R.ok(projectService.getById(id)); } - @SysLog("项目新增") @PostMapping("/save") - //@PreAuthorize("@pms.hasPermission('project_add')") public R save(@RequestBody Project project) { projectService.save(project); return R.ok(); @@ -62,24 +55,13 @@ public class ProjectController { @SysLog("项目修改") @PutMapping("/update") - //@PreAuthorize("@pms.hasPermission('project_edit')") public R update(@RequestBody Project project) { projectService.updateById(project); - // 更新项目 - new Thread(() -> { - List userList = userService.list(new LambdaQueryWrapper().eq(User::getDeptId, project.getProjectId())); - for (User user : userList) { - user.setDeptName(project.getName()); - userService.updateById(user); - } - }).start(); return R.ok(); } - @SysLog("项目删除") @DeleteMapping("/remove/{id:\\w+}") - //@PreAuthorize("@pms.hasPermission('project_del')") - public R remove(@PathVariable("id") String id) { + public R remove(@PathVariable String id) { if (projectService.getOne(Wrappers.lambdaQuery().eq(Project::getParentId, id)) != null) { return R.error("存在下级项目,不允许删除"); } @@ -87,19 +69,4 @@ public class ProjectController { return R.ok(); } - @SysLog("项目状态更改") - @GetMapping("/changeStatus") - //@PreAuthorize("@pms.hasPermission('project_edit')") - public R changeStatus(Project project) { - projectService.updateById(project); - return R.ok(); - } - - /** 加载项目列表树 */ - @GetMapping("/projectTree") - public R deptTree() { - List projectList = projectService.list(new LambdaQueryWrapper().orderByAsc(Project::getSort)); - return R.ok(projectService.buildTree(projectList, "0")); - } - } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DoctorMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DoctorMapper.java new file mode 100644 index 00000000..8b596d10 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DoctorMapper.java @@ -0,0 +1,16 @@ +package com.cloud.kicc.commonbiz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.commonbiz.api.entity.Doctor; + +/** + *

+ * 医生 Mapper + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/23 + */ +public interface DoctorMapper extends BaseMapper { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/HospitalMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/HospitalMapper.java new file mode 100644 index 00000000..fa6015d9 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/HospitalMapper.java @@ -0,0 +1,19 @@ +package com.cloud.kicc.commonbiz.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.cloud.kicc.commonbiz.api.entity.Hospital; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 医院管理 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface HospitalMapper extends BaseMapper { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OfficeMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OfficeMapper.java new file mode 100644 index 00000000..a2de7fc0 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OfficeMapper.java @@ -0,0 +1,17 @@ +package com.cloud.kicc.commonbiz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.commonbiz.api.entity.Office; + + +/** + *

+ * 科室 Mapper + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface OfficeMapper extends BaseMapper { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OrgHospitalMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OrgHospitalMapper.java new file mode 100644 index 00000000..6ecb0685 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OrgHospitalMapper.java @@ -0,0 +1,16 @@ +package com.cloud.kicc.commonbiz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.commonbiz.api.entity.OrgHospital; + +/** + *

+ * 机构医院关联 Mapper + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface OrgHospitalMapper extends BaseMapper { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OrgMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OrgMapper.java new file mode 100644 index 00000000..d7d6903a --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/OrgMapper.java @@ -0,0 +1,20 @@ +package com.cloud.kicc.commonbiz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.commonbiz.api.entity.Org; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + *

+ * 机构 Mapper + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface OrgMapper extends BaseMapper { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/ProjectMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/ProjectMapper.java new file mode 100644 index 00000000..75c5505c --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/ProjectMapper.java @@ -0,0 +1,16 @@ +package com.cloud.kicc.commonbiz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.commonbiz.api.entity.Project; + +/** + *

+ * 项目管理 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface ProjectMapper extends BaseMapper { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/DoctorService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/DoctorService.java new file mode 100644 index 00000000..2db73b7a --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/DoctorService.java @@ -0,0 +1,16 @@ +package com.cloud.kicc.commonbiz.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.commonbiz.api.entity.Doctor; + +/** + *

+ * 服务接口 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/23 + */ +public interface DoctorService extends IService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/HospitalService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/HospitalService.java new file mode 100644 index 00000000..a44d4bd4 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/HospitalService.java @@ -0,0 +1,30 @@ +package com.cloud.kicc.commonbiz.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.commonbiz.api.entity.Hospital; + +/** + *

+ * 医院管理 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface HospitalService extends IService { + + /** + * 新增医院(包含上级机构关联数据) + * @param hospital 医院实体 + * @return boolean + */ + boolean insertHospital(Hospital hospital); + + /** + * 修改医院(包含上级机构关联数据) + * @param hospital 医院实体 + * @return boolean + */ + boolean updateHospital(Hospital hospital); + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OfficeService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OfficeService.java new file mode 100644 index 00000000..67eb3668 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OfficeService.java @@ -0,0 +1,15 @@ +package com.cloud.kicc.commonbiz.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.commonbiz.api.entity.Office; + +/** + *

+ * 科室服务 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface OfficeService extends IService { +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OrgHospitalService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OrgHospitalService.java new file mode 100644 index 00000000..e5ab3282 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OrgHospitalService.java @@ -0,0 +1,16 @@ +package com.cloud.kicc.commonbiz.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.commonbiz.api.entity.OrgHospital; + +/** + *

+ * 机构医院关联服务 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface OrgHospitalService extends IService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OrgService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OrgService.java new file mode 100644 index 00000000..79572e04 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/OrgService.java @@ -0,0 +1,18 @@ +package com.cloud.kicc.commonbiz.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.commonbiz.api.entity.Org; + +import java.util.List; + +/** + *

+ * 机构服务 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface OrgService extends IService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/ProjectService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/ProjectService.java new file mode 100644 index 00000000..dd5096e5 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/ProjectService.java @@ -0,0 +1,16 @@ +package com.cloud.kicc.commonbiz.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.commonbiz.api.entity.Project; + +/** + *

+ * 项目服务 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +public interface ProjectService extends IService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DoctorServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DoctorServiceImpl.java new file mode 100644 index 00000000..03246e44 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DoctorServiceImpl.java @@ -0,0 +1,20 @@ +package com.cloud.kicc.commonbiz.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cloud.kicc.commonbiz.mapper.DoctorMapper; +import com.cloud.kicc.commonbiz.service.DoctorService; +import com.cloud.kicc.commonbiz.api.entity.Doctor; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/23 + */ +@Service +public class DoctorServiceImpl extends ServiceImpl implements DoctorService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/HospitalServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/HospitalServiceImpl.java new file mode 100644 index 00000000..f143e055 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/HospitalServiceImpl.java @@ -0,0 +1,61 @@ +package com.cloud.kicc.commonbiz.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cloud.kicc.commonbiz.api.entity.Hospital; +import com.cloud.kicc.commonbiz.api.entity.OrgHospital; +import com.cloud.kicc.commonbiz.mapper.HospitalMapper; +import com.cloud.kicc.commonbiz.service.HospitalService; +import com.cloud.kicc.commonbiz.service.OrgHospitalService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 医院服务实现 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@Service +@RequiredArgsConstructor +@Transactional(rollbackFor = Exception.class) +public class HospitalServiceImpl extends ServiceImpl implements HospitalService { + + private final OrgHospitalService orgHospitalService; + + @Override + public boolean insertHospital(Hospital hospital) { + baseMapper.insert(hospital); + return insertOrgHospital(hospital); + } + + @Override + public boolean updateHospital(Hospital hospital) { + baseMapper.updateById(hospital); + orgHospitalService.remove(new LambdaQueryWrapper().eq(OrgHospital::getHospitalId, hospital.getId())); + return insertOrgHospital(hospital); + } + + public boolean insertOrgHospital(Hospital hospital) { + boolean rows = true; + List list = new ArrayList(); + for (String orgId : hospital.getOrgIds()) { + OrgHospital oh = new OrgHospital(); + oh.setOrgId(orgId); + oh.setHospitalId(hospital.getId()); + list.add(oh); + } + if (list.size() > 0) { + rows = orgHospitalService.saveBatch(list); + } + return rows; + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OfficeServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OfficeServiceImpl.java new file mode 100644 index 00000000..e35d0131 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OfficeServiceImpl.java @@ -0,0 +1,19 @@ +package com.cloud.kicc.commonbiz.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cloud.kicc.commonbiz.api.entity.Office; +import com.cloud.kicc.commonbiz.mapper.OfficeMapper; +import com.cloud.kicc.commonbiz.service.OfficeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 科室服务实现 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@Service +public class OfficeServiceImpl extends ServiceImpl implements OfficeService { +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OrgHospitalServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OrgHospitalServiceImpl.java new file mode 100644 index 00000000..acc1b795 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OrgHospitalServiceImpl.java @@ -0,0 +1,20 @@ +package com.cloud.kicc.commonbiz.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cloud.kicc.commonbiz.api.entity.OrgHospital; +import com.cloud.kicc.commonbiz.mapper.OrgHospitalMapper; +import com.cloud.kicc.commonbiz.service.OrgHospitalService; +import org.springframework.stereotype.Service; + +/** + *

+ * 机构与医院关联服务实现 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@Service +public class OrgHospitalServiceImpl extends ServiceImpl implements OrgHospitalService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OrgServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OrgServiceImpl.java new file mode 100644 index 00000000..8e45531c --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/OrgServiceImpl.java @@ -0,0 +1,20 @@ +package com.cloud.kicc.commonbiz.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cloud.kicc.commonbiz.api.entity.Org; +import com.cloud.kicc.commonbiz.mapper.OrgMapper; +import com.cloud.kicc.commonbiz.service.OrgService; +import org.springframework.stereotype.Service; + +/** + *

+ * 机构服务实现 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@Service +public class OrgServiceImpl extends ServiceImpl implements OrgService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/ProjectServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/ProjectServiceImpl.java new file mode 100644 index 00000000..d1d44a94 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/ProjectServiceImpl.java @@ -0,0 +1,20 @@ +package com.cloud.kicc.commonbiz.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cloud.kicc.commonbiz.api.entity.Project; +import com.cloud.kicc.commonbiz.mapper.ProjectMapper; +import com.cloud.kicc.commonbiz.service.ProjectService; +import org.springframework.stereotype.Service; + +/** + *

+ * 项目服务实现 + *

+ * + * @Author: entfrm开发团队-王翔 + * @since: 2022/7/27 + */ +@Service +public class ProjectServiceImpl extends ServiceImpl implements ProjectService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml index a9c3ce32..f332e3e7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml @@ -7,8 +7,8 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} - #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + #server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/InstitutionRelationMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DoctorMapper.xml similarity index 63% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/InstitutionRelationMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DoctorMapper.xml index 35a3621e..2d819aa7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/InstitutionRelationMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DoctorMapper.xml @@ -1,4 +1,5 @@ - - \ No newline at end of file + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/InstitutionMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/HospitalMapper.xml similarity index 67% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/InstitutionMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/HospitalMapper.xml index af794aba..24afabfd 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/InstitutionMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/HospitalMapper.xml @@ -1,4 +1,5 @@ - - \ No newline at end of file + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/OfficeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OfficeMapper.xml similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/OfficeMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OfficeMapper.xml index a52b2d0d..6c5c86c1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/OfficeMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OfficeMapper.xml @@ -1,4 +1,5 @@ - - \ No newline at end of file + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OrgHospitalMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OrgHospitalMapper.xml new file mode 100644 index 00000000..2ead2acc --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OrgHospitalMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/DoctorMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OrgMapper.xml similarity index 67% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/DoctorMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OrgMapper.xml index 89a60898..f387e4c1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/DoctorMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/OrgMapper.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/ProjectMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/ProjectMapper.xml new file mode 100644 index 00000000..25af8be0 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/ProjectMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java deleted file mode 100644 index e37ea5a8..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.cloud.kicc.system.controller; - -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.system.api.entity.Hospital; -import com.cloud.kicc.system.api.entity.Institution; -import com.cloud.kicc.system.api.entity.InstitutionRelation; -import com.cloud.kicc.system.service.HospitalService; -import com.cloud.kicc.system.service.InstitutionRelationService; -import com.cloud.kicc.system.service.InstitutionService; -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 15:32 2022/3/24 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/hospital") -@Api(value = "app", tags = "医院管理模块") -public class HospitalController { - - private final HospitalService hospitalService; - - private final InstitutionService institutionService; - - private final InstitutionRelationService institutionRelationService; - - /** - * 新增 - * @param hospital 节点dto - * @return - */ - @Transactional(rollbackFor = Exception.class) - @PostMapping("/add") - public R add(@RequestBody Hospital hospital){ - //新增医院 - hospitalService.save(hospital); - //医院机构关联 - List institutionRelations = new ArrayList<>(); - - - for (String institutionId : hospital.getInstitutionIds()) { - InstitutionRelation institutionRelation = new InstitutionRelation(); - institutionRelation.setInstitutionId(institutionId); - institutionRelation.setHospitalId(hospital.getId()); - institutionRelations.add(institutionRelation); - } - institutionRelationService.saveBatch(institutionRelations); - - return R.ok(hospital); - } -// @GetMapping("/{id}") -// public R queryById(@PathVariable String id){ -// hospitalService.getById(id); -// return R.ok(hospitalService.getById(id)); -// } - @GetMapping("/{id:\\w+}") - public R queryById(@PathVariable("id") String id){ - Hospital hospital = hospitalService.getById(id); - List institutionIds; - if(hospital!=null){ - institutionIds = institutionRelationService.list(new LambdaQueryWrapper().eq(InstitutionRelation::getHospitalId,hospital.getId())) - .stream().map(institutionRelation -> institutionRelation.getInstitutionId()).collect(Collectors.toList()); - hospital.setInstitutionIds(ArrayUtil.toArray(institutionIds,String.class)); - } - return R.ok(hospital); - } - /** - * 修改 - * @param hospital 修改对象 - * @return - */ -// @PutMapping("/update") -// public R update(@RequestBody Hospital hospital){ -// hospitalService.updateById(hospital); -// return R.ok(hospital); -// } - @PutMapping("/update") - public R update(@RequestBody Hospital hospital){ - hospitalService.updateHospital(hospital); - return R.ok(); - } - - /** - * 删除 - * @param id 节点id - * @return - */ - @DeleteMapping("/remove/{id:[\\w,]+}") - public R remove(@PathVariable("id") String[] id){ - hospitalService.removeByIds(Arrays.asList(id)); - return R.ok(); - } - - /** - * 查询根据id - * @param id - * @return - */ - @GetMapping("/query/{id}") - public R getById(@PathVariable("id") String id) { - return R.ok(hospitalService.getById(id)); - } - - /** - * 查询根据条件 - * @param - * @param hospital - * @return - */ -// @GetMapping("/list") -// public R list(Page page, Hospital hospital) { -// IPage iPage = hospitalService.page(page, getQueryWrapper(hospital)); -// return R.ok(iPage.getRecords(), iPage.getTotal()); -// } - @GetMapping("/list") - public R list(Hospital hospital){ - List hospitalList = hospitalService.list(getQueryWrapper(hospital)); - return R.ok(hospitalList,hospitalList.size()); - } - /** - * 查询医院关联的机构 - * @param id 医院id - * @return - */ - @GetMapping("/relation/institution/{id}") - public R relationInstitution(@PathVariable("id") String id){ - List institutions = institutionService.queryRelationInstitution(id); - return R.ok(institutions); - } - - - private LambdaQueryWrapper getQueryWrapper(Hospital hospital) { - return new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(hospital.getName()),Hospital::getName,hospital.getName()) - .eq(StrUtil.isNotBlank(hospital.getType()),Hospital::getType,hospital.getType()) - .between(StrUtil.isNotBlank(hospital.getBeginTime()) && StrUtil.isNotBlank(hospital.getEndTime()),Hospital::getCreateTime,hospital.getBeginTime(),hospital.getEndTime()) - .orderByAsc(Hospital::getCreateTime); - - } - - - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/InstitutionController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/InstitutionController.java deleted file mode 100644 index 09eb3274..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/InstitutionController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.cloud.kicc.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.system.api.entity.Institution; -import com.cloud.kicc.system.service.InstitutionService; -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; - -/** - * @Author: TangSheng - * @Description: 医检api - * @Since 1.0 - * @Date Created in 14:15 2022/4/21 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/institution") -@Api(value = "app", tags = "机构管理模块") -public class InstitutionController { - - private final InstitutionService institutionService; - - /** - * 查询根据id - * @param id - * @return - */ - @GetMapping("{id}") - public R queryById(@PathVariable String id) { - return R.ok(institutionService.getById(id)); - } - - /** - * 分页条件查询 - * @param - * @param institution - * @return - */ - @GetMapping("/list") - public R list( Institution institution) { - List result = institutionService.list( getQueryWrapper(institution)); - return R.ok(result, result.size()); - } - - /** - * 新增 - * @param institution - * @return - */ - @PostMapping("/add") - public R add(@RequestBody Institution institution) { - institutionService.save(institution); - return R.ok(); - } - - /** - * 修改 - * @param institution - * @return - */ - @PutMapping("/update") - public R update(@RequestBody Institution institution) { - institutionService.updateById(institution); - return R.ok(); - } - - /** - * 删除 - * @param id - * @return - */ - @DeleteMapping("/remove/{id:[\\w,]+}") - public R remove(@PathVariable("id") String[] id){ - institutionService.removeByIds(Arrays.asList(id)); - return R.ok(); - } - - - private QueryWrapper getQueryWrapper(Institution institution) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(institution.getName()), "name", institution.getName()) - .eq(StrUtil.isNotBlank(institution.getType()),"type",institution.getType()) - .between(StrUtil.isAllNotBlank(institution.getBeginTime(),institution.getEndTime()),"create_time", - institution.getBeginTime(), - institution.getEndTime()) - .orderByAsc("id"); - } - - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OfficeController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OfficeController.java deleted file mode 100644 index 715ccc4e..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OfficeController.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.cloud.kicc.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.system.api.entity.Office; -import com.cloud.kicc.system.service.OfficeService; -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; - -/** - * @Author: TangSheng - * @Description: 科室api - * @Since 1.0 - * @Date Created in 14:15 2022/4/21 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/office") -@Api(value = "app", tags = "科室管理模块") -public class OfficeController { - - private final OfficeService officeService; - - /** - * 查询根据id - * @param id - * @return - */ -// @GetMapping("/query/{id}") -// public R queryById(@PathVariable String id) { -// return R.ok(officeService.getById(id)); -// } - - /** - * 分页条件查询 - * @param - * @param office - * @return - */ - @GetMapping("/list") - public R list( Office office) { - List result = officeService.list( getQueryWrapper(office)); - return R.ok(result, result.size()); - } - - /** - * 新增 - * @param office - * @return - */ - @PostMapping("/add") - public R add(@RequestBody Office office) { - officeService.save(office); - return R.ok(); - } - - /** - * 修改 - * @param office - * @return - */ - @PutMapping("/update") - public R update(@RequestBody Office office) { - officeService.updateById(office); - return R.ok(); - } -@GetMapping("/{id}") -public R queryById(@PathVariable String id){ - return R.ok(officeService.getById(id)); -} - /** - * 删除 - * @param id - * @return - */ - @DeleteMapping("/remove/{id:[\\w,]+}") - public R remove(@PathVariable("id") String[] id){ - officeService.removeByIds(Arrays.asList(id)); - return R.ok(); - } - - - private QueryWrapper getQueryWrapper(Office office) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(office.getName()), "name", office.getName()) - .eq(StrUtil.isNotBlank(office.getOrganType()),"organ_type",office.getOrganType()) - .between(StrUtil.isAllNotBlank(office.getBeginTime(),office.getEndTime()),"create_time", - office.getBeginTime(), - office.getEndTime()) - .orderByAsc("id"); - } - - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DoctorMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DoctorMapper.java deleted file mode 100644 index 591de7d1..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DoctorMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.Doctor; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 14:07 2022/4/21 - */ -public interface DoctorMapper extends BaseMapper { -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java deleted file mode 100644 index 835807c0..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cloud.kicc.system.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.system.api.entity.Hospital; -import org.apache.ibatis.annotations.Param; - -/** - * @Author: TangSheng - * @Description: 医院管理 - * @Since 1.0 - * @Date Created in 15:28 2022/3/24 - */ -public interface HospitalMapper extends BaseMapper { - - /** - * 条件查询list - * @param page - * @param hospital - * @return - */ - IPage queryList(IPage page, @Param("param") Hospital hospital); - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/InstitutionMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/InstitutionMapper.java deleted file mode 100644 index c5b6d44b..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/InstitutionMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.Institution; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 14:04 2022/4/21 - */ -public interface InstitutionMapper extends BaseMapper { - - - /** - * 查询关联的组织 - * @param hospitalId - * @return - */ - @Select("select * from sys_institution i " + - "where id in (SELECT institution_id FROM `sys_institution_relation` where hospital_id = #{hospitalId})") - List queryRelationInstitution(@Param("hospitalId") String hospitalId); - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/InstitutionRelationMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/InstitutionRelationMapper.java deleted file mode 100644 index d40f9fae..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/InstitutionRelationMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.InstitutionRelation; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 11:08 2022/4/25 - */ -public interface InstitutionRelationMapper extends BaseMapper { - - - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OfficeMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OfficeMapper.java deleted file mode 100644 index b4df4aac..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OfficeMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.Office; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 14:05 2022/4/21 - */ -public interface OfficeMapper extends BaseMapper { -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectMapper.java deleted file mode 100644 index 8154993d..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.Project; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 14:00 2022/6/7 - */ -public interface ProjectMapper extends BaseMapper { -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DoctorService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DoctorService.java deleted file mode 100644 index 83574c48..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DoctorService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.Doctor; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 14:09 2022/4/21 - */ -public interface DoctorService extends IService { -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java deleted file mode 100644 index 96095ee5..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.Hospital; - -/** - * @Author: TangSheng - * @Description: 医院管理 - * @Since 1.0 - * @Date Created in 15:29 2022/3/24 - */ -public interface HospitalService extends IService { - - - IPage queryList(IPage page, Hospital hospital); - boolean updateHospital(Hospital hospital); -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/InstitutionRelationService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/InstitutionRelationService.java deleted file mode 100644 index 0e3642cc..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/InstitutionRelationService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.InstitutionRelation; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 11:09 2022/4/25 - */ -public interface InstitutionRelationService extends IService { - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/InstitutionService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/InstitutionService.java deleted file mode 100644 index 63e02450..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/InstitutionService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.Institution; - -import java.util.List; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 10:54 2022/6/9 - */ -public interface InstitutionService extends IService { - /** - * 查询关联组织 - * @param hospitalId - * @return - */ - List queryRelationInstitution(String hospitalId); -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OfficeService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OfficeService.java deleted file mode 100644 index c729783e..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OfficeService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.Office; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 14:08 2022/4/21 - */ -public interface OfficeService extends IService { -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectService.java deleted file mode 100644 index b8fe483c..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.Dept; -import com.cloud.kicc.system.api.entity.Project; - -import java.util.List; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 13:48 2022/6/7 - */ -public interface ProjectService extends IService { - List buildTree(List list, String parentId); -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DoctorServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DoctorServiceImpl.java deleted file mode 100644 index f8d93e8a..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DoctorServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.Doctor; -import com.cloud.kicc.system.mapper.DoctorMapper; -import com.cloud.kicc.system.service.DoctorService; -import org.springframework.stereotype.Service; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 14:13 2022/4/21 - */ -@Service -public class DoctorServiceImpl extends ServiceImpl implements DoctorService { -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java deleted file mode 100644 index b2e92364..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.cloud.kicc.system.service.impl; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.system.api.entity.Hospital; -import com.cloud.kicc.system.api.entity.InstitutionRelation; -import com.cloud.kicc.system.mapper.HospitalMapper; -import com.cloud.kicc.system.service.HospitalService; -import com.cloud.kicc.system.service.InstitutionRelationService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: TangSheng - * @Description: 医院管理 - * @Since 1.0 - * @Date Created in 15:30 2022/3/24 - */ -@Service -@AllArgsConstructor -public class HospitalServiceImpl extends ServiceImpl implements HospitalService { - private final InstitutionRelationService institutionRelationService; - @Override - public IPage queryList(IPage page, Hospital hospital) { - return this.baseMapper.queryList(page, hospital); - } - - @Override - public boolean updateHospital(Hospital hospital) { - //修改医院信息 - baseMapper.updateById(hospital); - //删除医院与机构关联 - institutionRelationService.remove(new LambdaQueryWrapper().eq(InstitutionRelation::getHospitalId,hospital.getId())); - insertInstitutionRelation(hospital); - return true; - } - public boolean insertInstitutionRelation(Hospital hospital){ - boolean rows = true; - //新增医院与机构关联 - List list = new ArrayList(); - for(String institutionId : hospital.getInstitutionIds()){ - InstitutionRelation relation = new InstitutionRelation(); - relation.setHospitalId(hospital.getId()); - relation.setInstitutionId(institutionId); - list.add(relation); - } - if (list.size()>0){ - rows = institutionRelationService.saveBatch(list); - } - return rows; - } -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/InstitutionRelationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/InstitutionRelationServiceImpl.java deleted file mode 100644 index 2018e093..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/InstitutionRelationServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.InstitutionRelation; -import com.cloud.kicc.system.mapper.InstitutionRelationMapper; -import com.cloud.kicc.system.service.InstitutionRelationService; -import org.springframework.stereotype.Service; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 11:10 2022/4/25 - */ -@Service -public class InstitutionRelationServiceImpl - extends ServiceImpl - implements InstitutionRelationService { - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/InstitutionServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/InstitutionServiceImpl.java deleted file mode 100644 index bd49574e..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/InstitutionServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.Institution; -import com.cloud.kicc.system.mapper.InstitutionMapper; -import com.cloud.kicc.system.service.InstitutionService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 14:11 2022/4/21 - */ -@Service -public class InstitutionServiceImpl extends ServiceImpl implements InstitutionService { - @Override - public List queryRelationInstitution(String hospitalId) { - return this.baseMapper.queryRelationInstitution(hospitalId); - } -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OfficeServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OfficeServiceImpl.java deleted file mode 100644 index 77265efd..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OfficeServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.Office; -import com.cloud.kicc.system.mapper.OfficeMapper; -import com.cloud.kicc.system.service.OfficeService; -import org.springframework.stereotype.Service; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 14:13 2022/4/21 - */ -@Service -public class OfficeServiceImpl extends ServiceImpl implements OfficeService { -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectServiceImpl.java deleted file mode 100644 index 6d1bafe3..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.Dept; -import com.cloud.kicc.system.api.entity.Project; -import com.cloud.kicc.system.mapper.ProjectMapper; -import com.cloud.kicc.system.service.ProjectService; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * 项目表,服务实现类 - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 13:51 2022/6/7 - */ -@Service -public class ProjectServiceImpl extends ServiceImpl implements ProjectService{ - - @Override - public List buildTree(List list, String parentId) { - List projectList = new ArrayList<>(); - for (Iterator iterator=list.iterator();iterator.hasNext();){ - Project p = iterator.next(); - if (StrUtil.equals(p.getParentId(),parentId)){ - - } - } - return projectList; - } - /** 递归列表 */ - private void recursion(List list, Project project) { - // 得到子节点列表 - List childList = getChildList(list, project); - project.setChildren(childList); - for (Project tChild : childList) { - if (hasChild(list, tChild)) { - // 判断是否有子节点 - Iterator it = childList.iterator(); - while (it.hasNext()) { - Project n = (Project) it.next(); - recursion(list, n); - } - } - } - } - /** 得到子节点列表 */ - private List getChildList(List list, Project project) { - List projectList = new ArrayList() ; - Iterator it = list.iterator(); - while (it.hasNext()) { - Project n = it.next(); - if (StrUtil.equals(n.getParentId(), project.getProjectId())) { - projectList.add(n); - } - } - return projectList; - } - - /** 判断是否有子节点 */ - private boolean hasChild(List list, Project t) { - return getChildList(list, t).size() > 0 ? true : false; - } -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/HospitalMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/HospitalMapper.xml deleted file mode 100644 index a3642100..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/HospitalMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ProjectMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ProjectMapper.xml deleted file mode 100644 index eea6e504..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ProjectMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/kicc-visual/kicc-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg b/kicc-visual/kicc-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg index 855c845e..52c07733 100644 --- a/kicc-visual/kicc-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg +++ b/kicc-visual/kicc-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg @@ -8,7 +8,7 @@ Copyright Dave Gandy 2016. All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -