esb пре 8 година
родитељ
комит
c170c25937
63 измењених фајлова са 83 додато и 73 уклоњено
  1. 1 1
      src/main/java/com/yihu/wlyy/job/AllSignJob.java
  2. 1 1
      src/main/java/com/yihu/wlyy/job/ChangeSignJob.java
  3. 6 6
      src/main/java/com/yihu/wlyy/job/CurrentDayAllQuotaJob.java
  4. 1 1
      src/main/java/com/yihu/wlyy/job/FollowUpJob.java
  5. 1 1
      src/main/java/com/yihu/wlyy/job/SignAgeGroupDiseaseJob.java
  6. 16 6
      src/main/java/com/yihu/wlyy/job/SignJob.java
  7. 1 1
      src/main/java/com/yihu/wlyy/job/UnSignJob.java
  8. 1 1
      src/main/java/com/yihu/wlyy/job/WaitSignJob.java
  9. 1 1
      src/main/java/com/yihu/wlyy/task/PushMsgTask.java
  10. 1 1
      src/main/java/com/yihu/wlyy/web/common/FileUploadController.java
  11. 1 1
      src/main/java/com/yihu/wlyy/web/common/account/LoginController.java
  12. 1 1
      src/main/java/com/yihu/wlyy/web/common/account/WechatController.java
  13. 1 1
      src/main/java/com/yihu/wlyy/web/common/advert/AdvertController.java
  14. 1 1
      src/main/java/com/yihu/wlyy/web/common/data/DataController.java
  15. 1 1
      src/main/java/com/yihu/wlyy/web/common/district/DistrictController.java
  16. 1 1
      src/main/java/com/yihu/wlyy/web/common/im/imController.java
  17. 1 1
      src/main/java/com/yihu/wlyy/web/common/qrcode/QrCodeController.java
  18. 1 1
      src/main/java/com/yihu/wlyy/web/common/system/SystemDictController.java
  19. 1 1
      src/main/java/com/yihu/wlyy/web/common/util/ManagerUtilController.java
  20. 1 1
      src/main/java/com/yihu/wlyy/web/common/version/VersionController.java
  21. 1 1
      src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java
  22. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java
  23. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java
  24. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultMoviController.java
  25. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultPublicController.java
  26. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/device/DoctorDeviceController.java
  27. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java
  28. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/family/DoctorFamilyController.java
  29. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpController.java
  30. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpControllerGeorge.java
  31. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpPlanRemindController.java
  32. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthController.java
  33. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthEduArticleController.java
  34. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthGuidanceController.java
  35. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthRecordController.java
  36. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/intervene/DoctorInterveneController.java
  37. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/medical/DoctorMedicalRecordController.java
  38. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/message/DoctorMessageController.java
  39. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/patient/DoctorPatientGroupController.java
  40. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/patient/PatientDiseaseController.java
  41. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/scheduling/DoctorWorkTimeController.java
  42. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java
  43. 1 1
      src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorSignController.java
  44. 1 1
      src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java
  45. 1 1
      src/main/java/com/yihu/wlyy/web/patient/family/PatientFamilyController.java
  46. 1 1
      src/main/java/com/yihu/wlyy/web/patient/followup/PatientFollowUpController.java
  47. 1 1
      src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java
  48. 1 1
      src/main/java/com/yihu/wlyy/web/patient/health/HealthNewsController.java
  49. 1 1
      src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthController.java
  50. 1 1
      src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthGuidanceController.java
  51. 1 1
      src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthRecordController.java
  52. 1 1
      src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalController.java
  53. 1 1
      src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalWithoutFilterController.java
  54. 1 1
      src/main/java/com/yihu/wlyy/web/patient/intervene/PatientInterveneController.java
  55. 1 1
      src/main/java/com/yihu/wlyy/web/patient/medical/PatientMedicalRecordController.java
  56. 1 1
      src/main/java/com/yihu/wlyy/web/patient/scheduling/SchedulingController.java
  57. 1 1
      src/main/java/com/yihu/wlyy/web/patient/sign/FamilyContractController.java
  58. 1 1
      src/main/java/com/yihu/wlyy/web/patient/sign/FamilyWithoutFilterController.java
  59. 1 1
      src/main/java/com/yihu/wlyy/web/patient/sign/PatientSignController.java
  60. 1 1
      src/main/java/com/yihu/wlyy/web/patient/talk/PatientDiscussionGroupController.java
  61. 1 1
      src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java
  62. 1 1
      src/main/java/com/yihu/wlyy/web/wx/HealthServiceController.java
  63. 1 1
      src/main/java/com/yihu/wlyy/web/wx/WechatCoreController.java

+ 1 - 1
src/main/java/com/yihu/wlyy/job/AllSignJob.java

@ -152,7 +152,7 @@ public class AllSignJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;

+ 1 - 1
src/main/java/com/yihu/wlyy/job/ChangeSignJob.java

@ -153,7 +153,7 @@ public class ChangeSignJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;

+ 6 - 6
src/main/java/com/yihu/wlyy/job/CurrentDayAllQuotaJob.java

@ -402,7 +402,7 @@ public class CurrentDayAllQuotaJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@ -504,7 +504,7 @@ public class CurrentDayAllQuotaJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@ -881,7 +881,7 @@ public class CurrentDayAllQuotaJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@ -1328,7 +1328,7 @@ public class CurrentDayAllQuotaJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@ -1429,7 +1429,7 @@ public class CurrentDayAllQuotaJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@ -1548,7 +1548,7 @@ public class CurrentDayAllQuotaJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;

+ 1 - 1
src/main/java/com/yihu/wlyy/job/FollowUpJob.java

@ -144,7 +144,7 @@ public class FollowUpJob implements Job {
            }
            SignFamily signFamily=signFamilyDao.findByIdcard(idCard.toString());
            if(signFamily==null){
                errorContent.append("随访id:"+plan.get("id")+",签约code:"+signFamily.getCode()+",随访中的患者身份证在签约表中找不到数据");
                errorContent.append("随访id:"+plan.get("id")+",签约code:,随访中的患者身份证在签约表中找不到数据");
                isAll=false;
                continue;
            }

+ 1 - 1
src/main/java/com/yihu/wlyy/job/SignAgeGroupDiseaseJob.java

@ -249,7 +249,7 @@ public class SignAgeGroupDiseaseJob implements Job {
        }
    }
    private String saveContent(List<SignFamily> signFamilys, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的待签约数据完成 ,数据库查询到待签约数目:"+signFamilys.size());
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的签约数据完成 ,数据库查询到签约数目:"+signFamilys.size());
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);
        string.append(",统计到机构的数据总数:"+orgCount);

+ 16 - 6
src/main/java/com/yihu/wlyy/job/SignJob.java

@ -186,7 +186,7 @@ public class SignJob implements Job {
                    continue;
                }
                String idCard=signFamily.getIdcard();
                if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
                if(idCard == null||((idCard.length()!=18&&idCard.length()!=15))) {
                    errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                    isAll=false;
                    errorCount++;
@ -300,16 +300,26 @@ public class SignJob implements Job {
                if (dctorPatientGroupInfo != null && dctorPatientGroupInfo.size() > 0) {
                    group=dctorPatientGroupInfo.get(0).getGroup();
                } else {
                    errorContent.append("签约code:"+signFamily.getCode()+",患者未分组");
                    group="1";
                }
                if(StringUtils.isEmpty(signFamily.getHospital())){
                    errorContent.append("签约code:"+signFamily.getCode()+",签约表机构hospital为空");
                    isAll=false;
                    continue;
                }
                Hospital hospital = hospitalsMap.get(getOrg(signFamily.getHospital()));//得到患者签约的机构
                if(hospital == null) {
                    errorContent.append("签约code:"+signFamily.getCode()+",签约的全科医生(doctor字段)的所属机构(wlyy_doctor表中的hospital字段)为空或者所属的机构数据有问题");
                    errorContent.append("签约code:"+signFamily.getCode()+",签约表机构hospital不存在");
                    isAll=false;
                    continue;
                }
                String town = hospital.getTown();
                if(StringUtils.isEmpty(town)) {
                    errorContent.append("签约code:"+signFamily.getCode()+",机构表中的区为空");
                    isAll=false;
                    continue;
                }
                //统计市  现在只有厦门市 默认先写死 后面再改
                compute_level2_2(cityGroupMap, group,Constant.city);
                cityCount++;
@ -547,7 +557,7 @@ public class SignJob implements Job {
                    continue;
                }
                String idCard=signFamily.getIdcard();
                if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
                if(idCard == null||((idCard.length()!=18&&idCard.length()!=15))) {
                    errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                    isAll=false;
                    errorCount++;
@ -682,7 +692,7 @@ public class SignJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||((idCard.length()!=18&&idCard.length()!=15))) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;
@ -756,7 +766,7 @@ public class SignJob implements Job {
    }
    private String saveContent(List<SignFamily> signFamilys, Long qkCount, Long orgCount, Long townCount, Long cityCount, boolean isAll, StringBuffer errorContent,Long errorCount) {
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的已改簽数据完成 ,数据库查询到改签数目:"+signFamilys.size());
        StringBuffer string=new StringBuffer("统计"+getYesterday()+" 的签约数据完成 ,数据库查询到签约数目:"+signFamilys.size());
        string.append(",过滤的脏数据数目:"+errorCount);
        string.append(",统计到市的数据总数:"+cityCount);
        string.append(",统计到区的数据总数:"+townCount);

+ 1 - 1
src/main/java/com/yihu/wlyy/job/UnSignJob.java

@ -158,7 +158,7 @@ public class UnSignJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;

+ 1 - 1
src/main/java/com/yihu/wlyy/job/WaitSignJob.java

@ -157,7 +157,7 @@ public class WaitSignJob implements Job {
                continue;
            }
            String idCard=signFamily.getIdcard();
            if(idCard == null||(idCard.length()==18||idCard.length()==15)) {
            if(idCard == null||(idCard.length()!=18&&idCard.length()!=15)) {
                errorContent.append("签约code:"+signFamily.getCode()+",签约表中(wlyy_sign_family)中的idCard数据异常");
                isAll=false;
                errorCount++;

+ 1 - 1
src/main/java/com/yihu/wlyy/task/PushMsgTask.java

@ -22,7 +22,7 @@ import com.yihu.wlyy.entity.wechat.WechatTemplateData;
import com.yihu.wlyy.util.HttpUtil;
@Controller
@RequestMapping(value = "/pushMsgTask", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/pushMsgTask", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "消息推送")
public class PushMsgTask {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/common/FileUploadController.java

@ -30,7 +30,7 @@ import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/upload", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/upload", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "文件上传")
public class FileUploadController extends BaseController {

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

@ -44,7 +44,7 @@ import java.util.List;
 * @author calvin
 */
@Controller
@RequestMapping(value = "/login", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/login", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者、医生及管理员登录")
public class LoginController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@ -34,7 +34,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 * @author calvin
 */
@Controller
@RequestMapping(value = "/weixin", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/weixin", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "微信端用户注册")
public class WechatController extends WeixinBaseController {

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

@ -12,7 +12,7 @@ import com.yihu.wlyy.service.common.advert.AdvertService;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "广告")
public class AdvertController extends BaseController {
	

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

@ -16,7 +16,7 @@ import com.yihu.wlyy.entity.dict.Disease;
import com.yihu.wlyy.service.common.data.DataService;
import com.yihu.wlyy.web.BaseController;
@RequestMapping(value = "/common/data", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/common/data", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Controller
@Api(description = "疾病与社区")
public class DataController extends BaseController {

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

@ -19,7 +19,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "省市区三级地址")
public class DistrictController extends BaseController {

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

@ -12,7 +12,7 @@ import com.yihu.wlyy.util.HttpUtil;
import com.yihu.wlyy.web.BaseController;
@RestController
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "IM-即时消息")
public class imController extends BaseController {
	

+ 1 - 1
src/main/java/com/yihu/wlyy/web/common/qrcode/QrCodeController.java

@ -23,7 +23,7 @@ import java.io.OutputStream;
 * Created by lyr on 2016/08/10.
 */
@Controller
@RequestMapping(value = "/qrcode", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/qrcode", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "二维码")
public class QrCodeController extends WeixinBaseController {

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

@ -20,7 +20,7 @@ import java.util.List;
 */
@Controller
@RequestMapping(value = "/common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "系统字典")
public class SystemDictController extends BaseController {
    @Autowired

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

@ -23,7 +23,7 @@ import java.util.HashMap;
 * Created by lyr on 2016/09/13.
 */
@RestController
@RequestMapping(value = "/manage_util", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/manage_util", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "管理工具及后台任务控制")
public class ManagerUtilController extends BaseController {

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

@ -19,7 +19,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/version", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/version", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "版本")
public class VersionController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * 修改历史数据处理控制器
 */
@Controller
@RequestMapping(value = "/dataHandling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/dataHandling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public class DataHandlingController extends BaseController {
    @Autowired

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

@ -47,7 +47,7 @@ import com.yihu.wlyy.repository.patient.SocialSecurityInfoDao;
 * @author calvin
 */
@Controller
@RequestMapping(value = "/doctor", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生")
public class DoctorController extends BaseController {

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

@ -37,7 +37,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "三师咨询")
public class DoctorConsultController extends WeixinBaseController {

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

@ -28,7 +28,7 @@ import com.yihu.wlyy.web.BaseController;
 * @author George
 */
@Controller
@RequestMapping(value = "/doctor/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "电话咨询")
public class DoctorConsultMoviController extends BaseController {

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

@ -32,7 +32,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/consult/public", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/consult/public", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "公共咨询")
public class DoctorConsultPublicController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/doctor/device/DoctorDeviceController.java

@ -26,7 +26,7 @@ import java.util.Map;
 *
 */
@Controller
@RequestMapping(value = "doctor/device", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "doctor/device", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(value = "患者设备管理--医生端", description = "患者设备管理--医生端")
public class DoctorDeviceController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@ -24,7 +24,7 @@ import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/talkgroup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/talkgroup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-讨论组")
public class DoctorDiscussionGroupController extends BaseController {
	// 医生服务类

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

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * Created by Administrator on 2016.08.20.
 */
@Controller
@RequestMapping(value = "/doctor/family", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/family", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-家庭查询")
public class DoctorFamilyController extends WeixinBaseController{
    @Autowired

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

@ -36,7 +36,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-随访干预")
public class DoctorFollowUpController extends BaseController {

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

@ -37,7 +37,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "随访干预")
public class DoctorFollowUpControllerGeorge extends BaseController {

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

@ -20,7 +20,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/followup/remind", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/followup/remind", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "随访提醒")
public class DoctorFollowUpPlanRemindController extends BaseController {

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

@ -26,7 +26,7 @@ import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/health_index", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/health_index", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-患者指标")
public class DoctorHealthController extends BaseController {

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

@ -34,7 +34,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/health/edu", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/health/edu", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "健康教育")
public class DoctorHealthEduArticleController extends BaseController {

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

@ -22,7 +22,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/health/guidance", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/health/guidance", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "健康指导")
public class DoctorHealthGuidanceController extends WeixinBaseController {

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

@ -24,7 +24,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/health_record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/health_record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "健康记录")
public class DoctorHealthRecordController extends BaseController {

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

@ -36,7 +36,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/intervene", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/intervene", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-预防与干预")
public class DoctorInterveneController extends BaseController {

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

@ -33,7 +33,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/medical/record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/medical/record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-病历夹")
public class DoctorMedicalRecordController extends BaseController {

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

@ -19,7 +19,7 @@ import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/message", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/message", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-消息")
public class DoctorMessageController extends BaseController {

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

@ -37,7 +37,7 @@ import com.yihu.wlyy.web.BaseController;
 * @author George
 */
@Controller
@RequestMapping(value = "/doctor/patient_group", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/patient_group", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-患者分组管理")
public class DoctorPatientGroupController extends BaseController {

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

@ -24,7 +24,7 @@ import java.util.List;
 * Created by lyr on 2016/09/09.
 */
@RestController
@RequestMapping(value = "/doctor/patient", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/patient", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者疾病")
public class PatientDiseaseController extends BaseController {

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

@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 * Created by lyr on 2016/08/19.
 */
@Controller
@RequestMapping(value = "/doctor/work_scheduling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/work_scheduling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-排班时间")
public class DoctorWorkTimeController extends BaseController {

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

@ -37,7 +37,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 * @author George
 */
@Controller
@RequestMapping(value = "/doctor/family_contract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/family_contract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-家庭签约")
public class DoctorFamilyContractController extends WeixinBaseController {

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

@ -28,7 +28,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@RestController
@RequestMapping(value = "/doctor/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/doctor/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-签约管理")
public class DoctorSignController extends BaseController {

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

@ -33,7 +33,7 @@ import java.util.List;
 * @author George
 */
@Controller
@RequestMapping(value = "/patient", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者管理")
public class PatientController extends WeixinBaseController {

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

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * Created by Administrator on 2016.08.20.
 */
@Controller
@RequestMapping(value = "/patient/family", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/family", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者家庭")
public class PatientFamilyController extends BaseController {
    @Autowired

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

@ -33,7 +33,7 @@ import com.yihu.wlyy.web.patient.followup.vo.FollowupPlanVO;
 * 
 */
@Controller
@RequestMapping(value = "/patient/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-随访干预")
public class PatientFollowUpController extends BaseController {
	@Autowired

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

@ -22,7 +22,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/health/edu", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/health/edu", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-健康教育")
public class HealthEduArticleController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/patient/health/HealthNewsController.java

@ -22,7 +22,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/health/news", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/health/news", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-健康资讯")
public class HealthNewsController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthController.java

@ -25,7 +25,7 @@ import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/patient/health_index", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/health_index", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者指标")
public class PatientHealthController extends BaseController {

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

@ -18,7 +18,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/health/guidance", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/health/guidance", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-健康指导")
public class PatientHealthGuidanceController extends BaseController {

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

@ -35,7 +35,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/health_record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/health_record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-健康记录")
public class PatientHealthRecordController extends WeixinBaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalController.java

@ -24,7 +24,7 @@ import java.util.List;
 * Created by Administrator on 2016.08.19.
 */
@Controller
@RequestMapping(value = "/patient/hosptail", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/hosptail", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医院查询")
public class HospitalController extends BaseController {
    @Autowired

+ 1 - 1
src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalWithoutFilterController.java

@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * Created by Administrator on 2016.08.19.
 */
@Controller
@RequestMapping(value = "/hosptail", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/hosptail", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医院查询-无过滤")
public class HospitalWithoutFilterController extends BaseController {
    @Autowired

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

@ -26,7 +26,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/intervene", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/intervene", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-干预控制")
public class PatientInterveneController extends BaseController {

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

@ -26,7 +26,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/medical/record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/medical/record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-病历夹")
public class PatientMedicalRecordController extends BaseController {

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

@ -25,7 +25,7 @@ import com.yihu.wlyy.web.BaseController;
 * 医生排班控制类
 */
@Controller
@RequestMapping(value = "patient/scheduling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "patient/scheduling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生排班")
public class SchedulingController extends BaseController {

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

@ -38,7 +38,7 @@ import java.util.List;
 *
 */
@Controller
@RequestMapping(value = "/patient/family_contract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/family_contract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-家庭签约")
public class FamilyContractController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/patient/sign/FamilyWithoutFilterController.java

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * Created by Administrator on 2016.08.26.
 */
@Controller
@RequestMapping(value = "/family_contract/homepage", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/family_contract/homepage", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "家庭查询-无过滤")
public class FamilyWithoutFilterController extends BaseController {

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

@ -21,7 +21,7 @@ import com.yihu.wlyy.service.app.sign.SignWebService;
import com.yihu.wlyy.web.BaseController;
@RestController
@RequestMapping(value = "/patient/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-签约管理")
public class PatientSignController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/patient/talk/PatientDiscussionGroupController.java

@ -14,7 +14,7 @@ import com.yihu.wlyy.service.app.talk.TalkGroupService;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/patient/talkgroup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/patient/talkgroup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-讨论组")
public class PatientDiscussionGroupController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * Created by lyr on 2016/08/16.
 */
@Controller
@RequestMapping(value = "/statistics", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/statistics", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "统计")
public class StatisticsController extends BaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/wx/HealthServiceController.java

@ -16,7 +16,7 @@ import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.web.WeixinBaseController;
@Controller
@RequestMapping(value = "/wx/health/service", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/wx/health/service", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-健康服务在线咨询")
public class HealthServiceController extends WeixinBaseController {

+ 1 - 1
src/main/java/com/yihu/wlyy/web/wx/WechatCoreController.java

@ -25,7 +25,7 @@ import java.util.Arrays;
 * Created by lyr on 2016/08/11.
 */
@Controller
@RequestMapping(value = "/weixin", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@RequestMapping(value = "/weixin", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "微信")
public class WechatCoreController extends WeixinBaseController {