Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

src/main/java/com/yihu/wlyy/entity/consult/ConsultMoVi.java

@@ -14,6 +14,7 @@ import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.doctor.profile.DoctorComment;
import com.yihu.wlyy.entity.IdEntity;
import io.swagger.annotations.Api;
/**
 * 电话视频咨询信息對象
@@ -23,6 +24,7 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_consult_movi")
@Api(description = "电视咨询")
public class ConsultMoVi extends IdEntity {
	/**

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/interceptors/DoctorInterceptor.java

@@ -51,7 +51,7 @@ public class DoctorInterceptor extends BaseInterceptor {
			if (token == null || token.getPlatform() != 2) {
				// 未登录
				response.getOutputStream().write(error(SystemConf.NOT_LOGIN, "请登录后再操作！").getBytes());
				flag = true/*false*/;
				flag = false;
			} else {
				if (token.getTimeout().getTime() < new Date().getTime()) {
					// 登录超时

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,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.doctor.team.sign.DoctorPatientGroupInfo;

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/DoctorAdminTeamDao.java

@@ -1,6 +1,9 @@
package com.yihu.wlyy.repository.doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.patient.Patient;
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;
@@ -24,4 +27,10 @@ public interface DoctorAdminTeamDao extends
    @Query("SELECT count(s) FROM SignFamily s WHERE doctorHealth = :healthDoctorCode AND doctor IN (:patterns)")
    Integer getHealthDoctorSignCount(@Param(value = "healthDoctorCode") String healthDoctorCode,
                                     @Param(value = "patterns") List<String> patterns);
    @Query("SELECT p FROM SignFamily s, Patient p WHERE doctor = :doctorCode AND doctorHealth IN (:patterns) AND s" +
            ".patient = p.code")
    Page<Patient> getHealthDoctorSigningPatients(@Param(value = "doctorCode") String doctorCode,
                                                 @Param(value = "patterns") List<String> patterns,
                                                 Pageable pageable);
}

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> findTeamExcludedMembers(@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/scheduling/DoctorWorkTimeService.java

@@ -15,6 +15,7 @@ import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.print.Doc;
import javax.transaction.Transactional;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -46,11 +47,16 @@ public class DoctorWorkTimeService extends BaseService {
     */
    public JSONObject findDoctorWorkTime(String doctor) throws Exception {
        JSONObject result = new JSONObject();
        Doctor doc = doctorDao.findByCode(doctor);
        if(doc == null){
            throw new Exception("doctor not exist");
        }
        WlyyDoctorWorkTime workTime = doctorWorkTimeDao.findDoctorWorkTime(doctor);
        List<WlyyDoctorWorkWeek> workWeekList = doctorWorkWeekDao.findDoctorWorkWeeks(doctor);
        result.put("workTime", workTime != null ? new JSONObject(workTime) : "");
        result.put("workWeeks", workWeekList != null ? new JSONArray(workWeekList) : "");
        result.put("doctor", doc != null ? new JSONObject(doc) : "");
        return result;
    }
@@ -346,12 +352,12 @@ public class DoctorWorkTimeService extends BaseService {
                        json.put("times", doctorWorkTime.getFamousConsultTimes());
                        flag = true;
                    }
                    if(StringUtils.isNotEmpty(workWeek.getMorning()) && workWeek.getMorning().equals("1")){
                    if(StringUtils.isNotEmpty(workWeek.getAfternoon()) && workWeek.getAfternoon().equals("1")){
                        json.put("status", "1");
                        json.put("times", doctorWorkTime.getFamousConsultTimes());
                        flag = true;
                    }
                    if(StringUtils.isNotEmpty(workWeek.getMorning()) && workWeek.getMorning().equals("1")){
                    if(StringUtils.isNotEmpty(workWeek.getNight()) && workWeek.getNight().equals("1")){
                        json.put("status", "1");
                        json.put("times", doctorWorkTime.getFamousConsultTimes());
                        flag = true;

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

@@ -3,13 +3,16 @@ package com.yihu.wlyy.service.app.team;
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 com.yihu.wlyy.entity.patient.Patient;
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;
import java.util.*;
@@ -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.findTeamExcludedMembers(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<>();
@@ -131,6 +142,22 @@ public class AdminTeamService extends BaseService {
        return counts;
    }
    public List<Patient> getMemberSigningPatients(long teamId, String doctorCode, int page, int size){
        List<String> healthDoctors = new ArrayList<>();
        List<Doctor> doctors = getMembers(teamId);
        for (Doctor doctor : doctors){
            if (doctor.getLevel() != 3) continue;
            healthDoctors.add(doctor.getCode());
        }
        Page<Patient> result = teamDao.getHealthDoctorSigningPatients(
                doctorCode, healthDoctors,
                new PageRequest(page, size));
        return result.getContent();
    }
    private void saveTeam(AdminTeam team) {
        teamDao.save(team);
    }

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/task/PushMsgTask.java

@@ -5,6 +5,7 @@ import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue;
import com.yihu.wlyy.util.SystemConf;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
@@ -20,6 +21,7 @@ import com.yihu.wlyy.util.HttpUtil;
@Controller
@RequestMapping(value = "/pushMsgTask")
@Api(description = "消息推送")
public class PushMsgTask {
	private static Logger logger = LoggerFactory.getLogger(PushMsgTask.class);

src/main/java/com/yihu/wlyy/web/common/FileUploadController.java

@@ -12,6 +12,7 @@ import java.util.Random;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.apache.commons.io.FileUtils;
import org.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -29,6 +30,7 @@ import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/upload")
@Api(description = "文件上传")
public class FileUploadController extends BaseController {
	/** 

src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -13,6 +13,7 @@ import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.RSAUtils;
import com.yihu.wlyy.util.SystemData;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.patchca.color.SingleColorFactory;
@@ -42,7 +43,7 @@ import java.util.List;
 */
@Controller
@RequestMapping(value = "/login")
//@Api(description = "用户登录")
@Api(description = "患者、医生及管理员登录")
public class LoginController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/common/account/WeinxinController.java

@@ -10,6 +10,7 @@ import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.SocialSecurityInfoDao;
import com.yihu.wlyy.service.app.family.FamilyService;
import com.yihu.wlyy.util.HttpUtil;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +33,8 @@ import com.yihu.wlyy.web.WeixinBaseController;
 */
@Controller
@RequestMapping(value = "/weixin")
//@Api(description = "微信端用户注册")
public class WeinxinController extends WeixinBaseController {
@Api(description = "微信端用户注册")
public class WechatController extends WeixinBaseController {
    @Autowired
    private PatientService patientService;

src/main/java/com/yihu/wlyy/web/common/advert/AdvertController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.common.advert;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,7 +11,7 @@ import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "common")
//@Api(description = "广告查询")
@Api(description = "广告")
public class AdvertController extends BaseController {
	
	@Autowired

src/main/java/com/yihu/wlyy/web/common/data/DataController.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.common.data;
import java.util.List;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@ import com.yihu.wlyy.web.BaseController;
@RequestMapping(value = "/common/data")
@Controller
@Api(description = "疾病与社区")
public class DataController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/common/district/DistrictController.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.common.district;
import java.util.List;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +18,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "common")
@Api(description = "省市区三级地址")
public class DistrictController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/common/im/imController.java

@@ -1,6 +1,7 @@
package com.yihu.wlyy.web.common.im;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -10,6 +11,7 @@ import com.yihu.wlyy.web.BaseController;
@RestController
@RequestMapping(value = "common")
@Api(description = "IM-即时消息")
public class imController extends BaseController {
	
	private static String host = "http://172.19.103.76:3000";

src/main/java/com/yihu/wlyy/web/common/qrcode/QrcodeController.java

@@ -4,6 +4,7 @@ import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.service.common.QrcodeService;
import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -21,7 +22,8 @@ import java.io.OutputStream;
 */
@Controller
@RequestMapping(value = "/qrcode")
public class QrcodeController extends WeixinBaseController {
@Api(description = "二维码")
public class QrCodeController extends WeixinBaseController {
    @Autowired
    private QrcodeService qrcodeService;
@@ -116,7 +118,7 @@ public class QrcodeController extends WeixinBaseController {
    @RequestMapping(value = "/hospital_img")
    public void downloadSqQrcode(String hospital, HttpServletResponse response){
        try{
            File file = new File(QrcodeController.class.getResource("/").getPath().replace("/WEB-INF/classes/", "") +
            File file = new File(QrCodeController.class.getResource("/").getPath().replace("/WEB-INF/classes/", "") +
                    File.separator +"qrcode" + File.separator + hospital + ".png");
            boolean flag = false;
            if(!file.exists()){
@@ -158,7 +160,7 @@ public class QrcodeController extends WeixinBaseController {
    @RequestMapping(value = "/town_img")
    public void downloadTownQrcode(String town, HttpServletResponse response){
        try{
            File file = new File(QrcodeController.class.getResource("/").getPath().replace("/WEB-INF/classes/", "") +
            File file = new File(QrCodeController.class.getResource("/").getPath().replace("/WEB-INF/classes/", "") +
                    File.separator +"qrcode" + File.separator + town + ".png");
            boolean flag = false;
            if(!file.exists()){
@@ -207,7 +209,7 @@ public class QrcodeController extends WeixinBaseController {
                    qrcodeService.makeDoctorQrcode(doctor,getAccessToken());
                    doc = doctorService.findDoctorByCode(doctor);
                }else{
                    File file = new File(QrcodeController.class.getResource("/").getPath().replace("/WEB-INF/classes/", "") +
                    File file = new File(QrCodeController.class.getResource("/").getPath().replace("/WEB-INF/classes/", "") +
                    File.separator +"qrcode" + File.separator + doc.getQrcode());
                    if(!file.exists()){
@@ -259,7 +261,7 @@ public class QrcodeController extends WeixinBaseController {
                    qrcodeService.makeDoctorQrcode(doctor,getAccessToken());
                    doc = doctorService.findDoctorByCode(doctor);
                }else{
                    File file = new File(QrcodeController.class.getResource("/").getPath().replace("/WEB-INF/classes/", "") +
                    File file = new File(QrCodeController.class.getResource("/").getPath().replace("/WEB-INF/classes/", "") +
                            File.separator +"qrcode" + File.separator + doc.getQrcode());
                    if(!file.exists()){

src/main/java/com/yihu/wlyy/web/common/sms/SMSController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.common.sms;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -18,6 +19,7 @@ import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/common")
@Api(description = "短信")
public class SMSController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/common/system/SystemDictController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.common.system;
import com.yihu.wlyy.entity.dict.SystemDict;
import com.yihu.wlyy.service.system.SystemDictService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@ import java.util.List;
@Controller
@RequestMapping(value = "/common")
@Api(description = "系统字典")
public class SystemDictController extends BaseController {
    @Autowired
    private SystemDictService systemDictService;

src/main/java/com/yihu/wlyy/web/common/util/ManagerUtilController.java

@@ -5,6 +5,7 @@ import com.yihu.wlyy.job.consult.FamousConsultTimesJob;
import com.yihu.wlyy.service.app.disease.PatientDiseaseService;
import com.yihu.wlyy.service.app.scheduling.DoctorWorkTimeService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.hash.HashMapper;
@@ -20,6 +21,7 @@ import java.util.HashMap;
 */
@RestController
@RequestMapping(value = "/manage_util")
@Api(description = "管理工具及后台任务控制")
public class ManagerUtilController extends BaseController{
    @Autowired

src/main/java/com/yihu/wlyy/web/common/version/VersionController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.common.version;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -17,6 +18,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/version")
@Api(description = "版本")
public class VersionController extends BaseController {
	@Autowired

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;
@@ -16,6 +16,7 @@ import com.yihu.wlyy.service.app.consult.ConsultTeamService;
import com.yihu.wlyy.service.app.hospital.HospitalDeptService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.*;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -44,6 +45,7 @@ import com.yihu.wlyy.repository.patient.SocialSecurityInfoDao;
 */
@Controller
@RequestMapping(value = "/doctor")
@Api(description = "医生")
public class DoctorController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -33,6 +34,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 */
@Controller
@RequestMapping(value = "/doctor/consult")
@Api(description = "三师咨询")
public class DoctorConsultController extends WeixinBaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultMoviController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.doctor.consult;
import java.sql.Time;
import java.util.Date;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/consult")
@Api(description = "电话咨询")
public class DoctorConsultMoviController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultPublicController.java

@@ -4,6 +4,7 @@ import java.util.Date;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -30,6 +31,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/consult/public")
@Api(description = "公共咨询")
public class DoctorConsultPublicController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorTalkGroupController.java

@@ -7,6 +7,7 @@ import com.yihu.wlyy.entity.discussion.WlyyTalkGroupMember;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.common.account.PatientService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -22,7 +23,8 @@ import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/talkgroup")
public class DoctorTalkGroupController extends BaseController {
@Api(description = "医生端-讨论组")
public class DoctorDiscussionGroupController extends BaseController {
	// 医生服务类
	@Autowired
	private DoctorService doctorService;

src/main/java/com/yihu/wlyy/web/doctor/family/DoctorFamilyController.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.doctor.family;
import com.yihu.wlyy.service.app.family.FamilyService;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 */
@Controller
@RequestMapping("/doctor/family")
@Api(description = "医生端-家庭查询")
public class DoctorFamilyController extends WeixinBaseController{
    @Autowired
    private FamilyService familyService;

src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpController.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -34,6 +35,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/followup")
@Api(description = "医生端-随访干预")
public class DoctorFollowUpController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpControllerGeorge.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -35,6 +36,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/followup")
@Api(description = "随访干预")
public class DoctorFollowUpControllerGeorge extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpPlanRemindController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.doctor.followup;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +19,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/followup/remind")
@Api(description = "随访提醒")
public class DoctorFollowUpPlanRemindController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthController.java

@@ -26,7 +26,7 @@ import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/health_index")
@Api(description = "患者指标接口--医生端")
@Api(description = "医生端-患者指标")
public class DoctorHealthController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthEduArticleController.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -32,6 +33,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/health/edu")
@Api(description = "健康教育")
public class DoctorHealthEduArticleController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthGuidanceController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.doctor.health;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 */
@Controller
@RequestMapping(value = "/doctor/health/guidance")
@Api(description = "健康指导")
public class DoctorHealthGuidanceController extends WeixinBaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthRecordController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.doctor.health;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/health_record")
@Api(description = "健康记录")
public class DoctorHealthRecordController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/intervene/DoctorInterveneController.java

@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/intervene")
@Api(description = "医生端-预防与干预")
public class DoctorInterveneController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/medical/DoctorMedicalRecordController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.doctor.medical;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -31,6 +32,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/medical/record")
@Api(description = "医生端-病历夹")
public class DoctorMedicalRecordController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/message/DoctorMessageController.java

@@ -1,6 +1,7 @@
package com.yihu.wlyy.web.doctor.message;
import com.yihu.wlyy.entity.message.Message;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,7 @@ import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/message")
@Api(description = "医生端-消息")
public class DoctorMessageController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/doctor/patient/DoctorPatientGroupController.java

@@ -9,6 +9,7 @@ import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -34,6 +35,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/doctor/patient_group")
@Api(description = "医生端-患者分组管理")
public class DoctorPatientGroupController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/doctor/patient/PatientDiseaseController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.doctor.patient;
import com.yihu.wlyy.entity.patient.PatientDisease;
import com.yihu.wlyy.service.app.disease.PatientDiseaseService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.bouncycastle.jce.provider.symmetric.ARC4;
import org.json.JSONArray;
@@ -21,6 +22,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = "/doctor/patient")
@Api(description = "患者疾病")
public class PatientDiseaseController extends BaseController{
    @Autowired

src/main/java/com/yihu/wlyy/web/doctor/scheduling/DoctorWorkTimeController.java

@@ -4,6 +4,7 @@ import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.scheduling.DoctorWorkTimeService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 */
@Controller
@RequestMapping(value = "/doctor/work_scheduling")
@Api(description = "医生端-排班时间")
public class DoctorWorkTimeController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -5,6 +5,7 @@ import java.util.Map;
import com.yihu.wlyy.entity.message.Message;
import com.yihu.wlyy.service.app.account.PatientInfoService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -36,6 +37,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 */
@Controller
@RequestMapping(value = "/doctor/family_contract")
@Api(description = "医生端-家庭签约")
public class DoctorFamilyContractController extends WeixinBaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorSignController.java

@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,7 @@ import com.yihu.wlyy.web.BaseController;
@RestController
@RequestMapping(value = "/doctor/sign")
@Api(description = "医生端-签约管理")
public class DoctorSignController extends BaseController {
//	@Autowired

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

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.doctor.team;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.web.BaseController;
@@ -45,17 +46,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 +63,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 +77,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 +105,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 +134,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 +181,30 @@ 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());
        }
    }
    @RequestMapping(value = "/teams/{team_id}/members/{doctor_code}/signing", method = RequestMethod.GET)
    @ApiOperation(value = "获取团队医生的队内签约患者列表")
    public String getDoctorSignPatients(@PathVariable("team_id") long teamId,
                                        @PathVariable("doctor_code") String doctorCode,
                                        @RequestParam(value = "page", defaultValue = "1", required = false) int page,
                                        @RequestParam(value = "size", defaultValue = "10", required = false) int size) {
        try {
            page = page <= 0 ? 0 : page - 1;
            List<Patient> patients = memberService.getMemberSigningPatients(teamId, doctorCode, page, size);
            return write(200, "OK", "data", new JSONArray(patients));
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }

src/main/java/com/yihu/wlyy/web/manager/IndexController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.manager;
import io.swagger.annotations.Api;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -8,6 +9,7 @@ import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/index")
@Api(description = "主页-非API")
public class IndexController extends BaseController {
	
	@RequestMapping(method = RequestMethod.GET)

src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -12,6 +12,7 @@ import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.EncodesUtil;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -31,6 +32,7 @@ import java.util.List;
 */
@Controller
@RequestMapping(value = "/patient")
@Api(description = "患者管理")
public class PatientController extends WeixinBaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultCommunicationController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.patient.consult;
import java.util.Date;
//import io.swagger.annotations.Api;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -25,7 +26,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
@Controller
@RequestMapping(value = "/patient/consult/communication")
//@Api(description = "患者端-病友圈查询")
@Api(description = "患者端-病友圈")
public class ConsultCommunicationController extends WeixinBaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -8,6 +8,7 @@ import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.schedule.WlyyDoctorWorkTime;
import com.yihu.wlyy.entity.doctor.schedule.WlyyDoctorWorkWeek;
import com.yihu.wlyy.service.app.scheduling.DoctorWorkTimeService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -37,6 +38,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 */
@Controller
@RequestMapping(value = "/patient/consult")
@Api(description = "患者端-患者咨询")
public class ConsultController extends WeixinBaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultPublicController.java

@@ -4,6 +4,7 @@ import java.util.Date;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.app.account.PatientInfoService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -29,6 +30,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 */
@Controller
@RequestMapping(value = "/patient/consult/public")
@Api(description = "图文咨询,公共咨询,病友圈")
public class ConsultPublicController extends WeixinBaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/patient/family/PatientFamilyController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.patient.family;
import com.yihu.wlyy.entity.patient.invitation.PatientInvitationLog;
import com.yihu.wlyy.service.app.family.FamilyService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 */
@Controller
@RequestMapping("/patient/family")
@Api(description = "患者家庭")
public class PatientFamilyController extends BaseController {
    @Autowired
    private FamilyService familyService;

src/main/java/com/yihu/wlyy/web/patient/followup/PatientFollowUpController.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,7 @@ import com.yihu.wlyy.web.patient.followup.vo.FollowupPlanVO;
 */
@Controller
@RequestMapping(value = "/patient/followup")
@Api(description = "患者端-随访干预")
public class PatientFollowUpController extends BaseController {
	@Autowired
	private PatientFollowUpService patientFollowUpService;

src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.patient.health;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/patient/health/edu")
@Api(description = "患者端-健康教育")
public class HealthEduArticleController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthGuidanceController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.patient.health;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -16,6 +17,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/patient/health/guidance")
@Api(description = "患者端-健康指导")
public class PatientHealthGuidanceController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthRecordController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.patient.health;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -33,6 +34,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 */
@Controller
@RequestMapping(value = "/patient/health_record")
@Api(description = "患者端-健康记录")
public class PatientHealthRecordController extends WeixinBaseController {
	@Autowired

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

@@ -1,11 +1,12 @@
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;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,8 @@ import java.util.List;
 */
@Controller
@RequestMapping(value = "/patient/hosptail")
public class HosptailController extends BaseController {
@Api(description = "医院查询")
public class HospitalController extends BaseController {
    @Autowired
   private HospitalService hospitalService;

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

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.patient.hosptail;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 */
@Controller
@RequestMapping(value = "/hosptail")
public class HosptailWithOutFilterController extends BaseController {
@Api(description = "医院查询-无过滤")
public class HospitalWithoutFilterController extends BaseController {
    @Autowired
    private DoctorInfoService doctorInfoService;
    /**

src/main/java/com/yihu/wlyy/web/patient/intervene/PatientInterveneController.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.patient.intervene;
import java.util.List;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/patient/intervene")
@Api(description = "患者端-干预控制")
public class PatientInterveneController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/patient/medical/PatientMedicalRecordController.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.patient.medical;
import java.util.List;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -24,6 +25,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "/patient/medical/record")
@Api(description = "患者端-病历夹")
public class PatientMedicalRecordController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/patient/scheduling/SchedulingController.java

@@ -5,6 +5,7 @@ import java.util.List;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -23,6 +24,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@Controller
@RequestMapping(value = "patient/scheduling")
@Api(description = "医生排班")
public class SchedulingController extends BaseController {
	@Autowired

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;
@@ -16,6 +16,7 @@ import com.yihu.wlyy.util.IdcardValidator;
import com.yihu.wlyy.util.RSAUtils;
import com.yihu.wlyy.web.BaseController;
import com.yihu.wlyy.entity.patient.invitation.PatientInvitationLog;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -36,6 +37,7 @@ import java.util.List;
 */
@Controller
@RequestMapping(value = "/patient/family_contract")
@Api(description = "患者端-家庭签约")
public class FamilyContractController extends BaseController {
	@Autowired

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

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.patient.sign;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -13,7 +14,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 */
@Controller
@RequestMapping(value = "/family_contract/homepage")
public class FamilyWithOutfliterController extends BaseController {
@Api(description = "家庭查询-无过滤")
public class FamilyWithoutFilterController extends BaseController {
    @Autowired
    private FamilyContractService familyContractService;

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

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -19,6 +20,7 @@ import com.yihu.wlyy.web.BaseController;
@RequestMapping(value = "/patient/sign")
@RestController
@Api(description = "患者端-签约管理")
public class PatientSignController extends BaseController {
	@Autowired

src/main/java/com/yihu/wlyy/web/quota/JobController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.quota;
import com.yihu.wlyy.job.*;
import com.yihu.wlyy.service.quota.JobService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 */
@Controller
@RequestMapping("/job")
@Api(description = "后台-任务控制")
public class JobController extends BaseController {
    @Autowired
    private JobService jobService;

src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.statistic;
import com.yihu.wlyy.service.app.statistics.StatisticsService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 */
@Controller
@RequestMapping(value = "/statistics")
@Api(description = "统计")
public class StatisticsController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/wx/HealthServiceController.java

@@ -4,6 +4,7 @@ import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -15,6 +16,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
@Controller
@RequestMapping("/wx/health/service")
@Api(description = "患者端-健康服务在线咨询")
public class HealthServiceController extends WeixinBaseController {
	/**

src/main/java/com/yihu/wlyy/web/wx/MyInfoController.java

@@ -4,6 +4,7 @@ import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -15,6 +16,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
@Controller
@RequestMapping("/wx/my/info")
@Api(description = "患者端-个人信息")
public class MyInfoController extends WeixinBaseController {
	/**

src/main/java/com/yihu/wlyy/web/wx/SelfManagementController.java

@@ -4,6 +4,7 @@ import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONException;
import org.json.JSONObject;
@@ -20,6 +21,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
@Controller
@RequestMapping("/wx/self/management")
@Api(description = "自我管理")
public class SelfManagementController extends WeixinBaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/wx/WeiXinCoreController.java

@@ -4,6 +4,7 @@ import com.yihu.wlyy.service.weixin.WeiXinCoreService;
import com.yihu.wlyy.util.HttpUtil;
import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,8 @@ import java.util.Arrays;
 */
@Controller
@RequestMapping(value = "/weixin")
public class WeiXinCoreController extends WeixinBaseController {
@Api(description = "微信")
public class WechatCoreController extends WeixinBaseController {
    @Autowired
    private WeiXinCoreService weiXinCoreService;
@@ -149,7 +151,7 @@ public class WeiXinCoreController extends WeixinBaseController {
    @ResponseBody
    public String createMenuTest(){
        try{
            String filePath = WeiXinCoreController.class.getResource("/").getPath() +
            String filePath = WechatCoreController.class.getResource("/").getPath() +
                    File.separator + "weixin_menu.txt";
            String url = " https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + getAccessToken();
            // 读取微信菜单配置文件