将HTTP的PUT,DELETE方法修改为GET与POST方法

src/main/java/com/yihu/wlyy/entity/address/Hospital.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.address;
package com.yihu.wlyy.entity.organization;
import com.yihu.wlyy.entity.IdEntity;
@@ -7,52 +7,30 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 城市信息對象
 * @author George
 * 医院
 *
 * @author George
 */
@Entity
@Table(name = "dm_hospital")
public class Hospital extends IdEntity {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = 8039389705624435301L;
	
	// 医院編碼
	private String code;
	// 医院名稱
	private String name;	
	// 作废标志
	private String del;
	//省份标志
	private String province;
	//省份名称
	private String provinceName;
	//城市标志
	private String city;
	//城市名称
	private String cityName;
	//区县标志
	private String town;
	//区县名称
	private String townName;
	//级别，1医院，2社区医院
	private Integer level;
	//医院详细地址
	private String address;
	//医院简介
	private String intro;
	
	//医院图片
	private String photo;
	//街道编码
	private String roadCode;
	//中心/站点
	private String centerSite;
	private String code;            // 医院編碼
	private String name;	        // 医院名稱
	private String del;             // 作废标志
	private String province;        //省份标志
	private String provinceName;    //省份名称
	private String city;            //城市标志
	private String cityName;        //城市名称
	private String town;            //区县标志
	private String townName;        //区县名称
	private Integer level;          //级别，1医院，2社区医院
	private String address;         //医院详细地址
	private String intro;           //医院简介
	private String photo;           //医院图片
	private String roadCode;        //街道编码
	private String centerSite;      //中心/站点
	public String getDel() {
		return del;

src/main/java/com/yihu/wlyy/job/ChangeSignJob.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;

src/main/java/com/yihu/wlyy/job/ConsultJob.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.doctor.profile.Doctor;

src/main/java/com/yihu/wlyy/job/CurrentDayAllQuotaJob.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.doctor.profile.Doctor;

src/main/java/com/yihu/wlyy/job/FollowUpJob.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;

src/main/java/com/yihu/wlyy/job/HealthGuideJob.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;

src/main/java/com/yihu/wlyy/job/SignAgeGroupDiseaseJob.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.SignFamily;

src/main/java/com/yihu/wlyy/job/SignJob.java

@@ -1,26 +1,19 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.PatientDisease;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorPatientGroupInfoDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.service.app.disease.PatientDiseaseService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.IdCardUtil;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;

src/main/java/com/yihu/wlyy/job/UnSignJob.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;

src/main/java/com/yihu/wlyy/job/WaitSignJob.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;

src/main/java/com/yihu/wlyy/repository/doctor/DoctorAdminTeamMemberDao.java

@@ -3,8 +3,9 @@ package com.yihu.wlyy.repository.doctor;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeamMember;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
@@ -31,4 +32,10 @@ public interface DoctorAdminTeamMemberDao extends
    @Query("SELECT 1 FROM AdminTeamMember WHERE teamId = :teamId AND doctorCode = :doctorCode")
    Integer isMemberExist(@Param(value = "teamId") long teamId, @Param(value = "doctorCode") String doctorCode);
    @Query("SELECT d from Hospital h, Doctor d WHERE h.code = d.hospital AND h.code = :orgCode AND d.code not in " +
            "(select t.doctorCode from AdminTeamMember t WHERE t.teamId = :teamId)")
    Page<Doctor> findTeamExcledMembers(@Param(value = "orgCode") String orgCode,
                                       @Param(value = "teamId") long teamId,
                                       Pageable pageable);
}

src/main/java/com/yihu/wlyy/repository/organization/HospitalDao.java

@@ -11,7 +11,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import java.util.List;

src/main/java/com/yihu/wlyy/repository/organization/HospitalDeptDao.java

@@ -5,16 +5,11 @@
 *******************************************************************************/
package com.yihu.wlyy.repository.organization;
import com.yihu.wlyy.entity.address.Hospital;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.wlyy.entity.organization.HospitalDept;
import com.yihu.wlyy.entity.address.Province;
public interface HospitalDeptDao  extends PagingAndSortingRepository<HospitalDept, Long>,JpaSpecificationExecutor<HospitalDept> {
	// 根據CODE查詢科室名称

src/main/java/com/yihu/wlyy/service/app/hospital/HospitalDeptService.java

@@ -1,6 +1,5 @@
package com.yihu.wlyy.service.app.hospital;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.HospitalDept;
import com.yihu.wlyy.repository.organization.HospitalDeptDao;
import com.yihu.wlyy.service.BaseService;

src/main/java/com/yihu/wlyy/service/app/hospital/HospitalService.java

@@ -19,7 +19,7 @@ import org.springside.modules.persistence.DynamicSpecifications;
import org.springside.modules.persistence.SearchFilter;
import org.springside.modules.persistence.SearchFilter.Operator;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.service.BaseService;

src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -2,7 +2,7 @@ package com.yihu.wlyy.service.app.sign;
import java.util.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.dict.SystemDict;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroupInfo;

src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -1,10 +1,9 @@
package com.yihu.wlyy.service.app.statistics;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.statistics.PopulationBase;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.repository.address.CityDao;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;

src/main/java/com/yihu/wlyy/service/app/team/AdminTeamService.java

@@ -7,6 +7,9 @@ import com.yihu.wlyy.repository.doctor.DoctorAdminTeamDao;
import com.yihu.wlyy.repository.doctor.DoctorAdminTeamMemberDao;
import com.yihu.wlyy.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@@ -97,6 +100,14 @@ public class AdminTeamService extends BaseService {
        return memberDao.findAllMembers(teamId);
    }
    public List<Doctor> getExcludedMembers(String orgCode, long teamId, int page, int size){
        Pageable pageable = new PageRequest(page, size);
        Page<Doctor> doctors = memberDao.findTeamExcledMembers(orgCode, teamId, pageable);
        if (doctors == null) return null;
        return doctors.getContent();
    }
    public Map<String, Integer> getMemberSigningCount(List<Doctor> doctors){
        Map<String, Integer> counts = new HashMap<>();

src/main/java/com/yihu/wlyy/service/common/QrcodeService.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.service.common;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.repository.address.TownDao;

src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -3,7 +3,7 @@ package com.yihu.wlyy.web.doctor.account;
import java.util.List;
import java.util.Map;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.profile.DoctorComment;
import com.yihu.wlyy.entity.organization.HospitalDept;

src/main/java/com/yihu/wlyy/web/doctor/team/AdminTeamController.java

@@ -45,17 +45,6 @@ public class AdminTeamController extends BaseController {
        }
    }
    /*@ResponseBody
    @RequestMapping(method = RequestMethod.GET)
    @ApiOperation(value = "团队列表")
    public String getTeamList(
            @RequestParam("filter") String filter,
            @RequestParam("order") String order,
            @RequestParam("page") int page,
            @RequestParam("size") int pageSize) {
        return null;
    }*/
    @RequestMapping(method = RequestMethod.POST)
    @ApiOperation(value = "创建团队")
    public String createTeam(@RequestParam("team_name") String teamName,
@@ -73,7 +62,7 @@ public class AdminTeamController extends BaseController {
        }
    }
    @RequestMapping(value = "/{team_id}/name", method = RequestMethod.PUT)
    @RequestMapping(value = "/{team_id}/name", method = RequestMethod.POST)
    @ApiOperation(value = "更新团队名称")
    public String updateTeamName(@PathVariable("team_id") long teamId,
                                 @RequestParam("team_name") String teamName) {
@@ -87,7 +76,7 @@ public class AdminTeamController extends BaseController {
        }
    }
    @RequestMapping(value = "/{team_id}/leader", method = RequestMethod.PUT)
    @RequestMapping(value = "/{team_id}/leader", method = RequestMethod.POST)
    @ApiOperation(value = "更新团队领导")
    public String updateTeamLeader(@PathVariable("team_id") long teamId,
                                   @RequestParam("doctor_code") String doctorCode) {
@@ -115,11 +104,14 @@ public class AdminTeamController extends BaseController {
    }
    @RequestMapping(value = "/{team_id}/members", method = RequestMethod.POST)
    @ApiOperation(value = "添加团队成员")
    @ApiOperation(value = "添加团队成员，批量添加使用逗号分隔列表")
    public String addMember(@PathVariable("team_id") long teamId,
                            @RequestParam("doctor_code") String doctorCode) {
                            @RequestParam("doctor_code") String doctorCodeList) {
        try {
            teamService.addMember(teamId, doctorCode);
            String doctorCodes[] = doctorCodeList.split(",");
            for (String doctorCode : doctorCodes) {
                teamService.addMember(teamId, doctorCode);
            }
            return write(200, "OK", "data", "");
        } catch (Exception e) {
@@ -141,8 +133,24 @@ public class AdminTeamController extends BaseController {
        }
    }
    @RequestMapping(value = "/{team_id}/members/{doctor_code}", method = RequestMethod.DELETE)
    @ResponseStatus(HttpStatus.NO_CONTENT)
    @RequestMapping(value = "/{team_id}/members/excluded", method = RequestMethod.GET)
    @ApiOperation(value = "获取机构内不在特定团队的医生")
    public String getExcludedTeamMembers(@RequestParam("org_code") String orgCode,
                                         @PathVariable("team_id") long teamId,
                                         @RequestParam(value = "page", required = false, defaultValue = "1") int page,
                                         @RequestParam(value = "size", required = false, defaultValue = "10") int size) {
        try {
            page = page <= 0 ? 0 : page - 1;
            List<Doctor> members = memberService.getExcludedMembers(orgCode, teamId, page, size);
            return write(200, "OK", "data", new JSONArray(members));
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
    @RequestMapping(value = "/{team_id}/members/{doctor_code}/remove", method = RequestMethod.POST)
    @ApiOperation(value = "移除成员")
    public String removeMember(@PathVariable("team_id") long teamId,
                               @PathVariable("doctor_code") String doctorCode) {
@@ -172,13 +180,13 @@ public class AdminTeamController extends BaseController {
    @RequestMapping(value = "/teams/{team_id}/signing/count", method = RequestMethod.GET)
    @ApiOperation(value = "获取团队医生的队内签约数量")
    public String getDoctorSignPatientCount(@PathVariable("team_id") long teamId){
        try{
    public String getDoctorSignPatientCount(@PathVariable("team_id") long teamId) {
        try {
            List<Doctor> members = memberService.getMembers(teamId);
            Map<String, Integer> counts = memberService.getMemberSigningCount(members);
            return write(200, "OK", "data", new JSONObject(counts));
        } catch (Exception e){
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }

src/main/java/com/yihu/wlyy/web/patient/hosptail/HosptailController.java

@@ -1,7 +1,7 @@
package com.yihu.wlyy.web.patient.hosptail;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.hospital.HospitalService;

src/main/java/com/yihu/wlyy/web/patient/sign/FamilyContractController.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.web.patient.sign;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.message.Message;