代码优化

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/ServiceStatisticsController.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.doctor.patient;
import com.yihu.wlyy.service.app.statistics.ServiceStatisticsService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.json.JSONObject;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@RequestMapping(value = "/doctor/patient/service",method = {RequestMethod.GET,RequestMethod.POST})
@Api(description = "统计服务查询")
public class ServiceStatisticsController extends BaseController {
    @Autowired

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/SignPatientLabelController.java

@@ -7,6 +7,7 @@ import com.yihu.wlyy.repository.doctor.SignLabelDao;
import com.yihu.wlyy.service.app.label.SignPatientLabelService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -26,6 +27,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = "/doctor/patient_label",method = {RequestMethod.GET,RequestMethod.POST})
@Api(description = "标签类别管理")
public class SignPatientLabelController extends BaseController {
    @Autowired

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/SignPatientLabelInfoController.java

@@ -22,8 +22,8 @@ import java.util.List;
 * Created by lyr on 2016/10/9.
 */
@RestController
@RequestMapping(value = "/doctor/patient_label_info",method = {RequestMethod.GET,RequestMethod.POST})
@Api("居民管理")
@RequestMapping(value = "/doctor/patient_label_info", method = {RequestMethod.GET, RequestMethod.POST})
@Api(description = "居民标签管理")
public class SignPatientLabelInfoController extends BaseController {
    @Autowired
@@ -88,7 +88,7 @@ public class SignPatientLabelInfoController extends BaseController {
                return error(-1, "团队不能为空！");
            }
            long team = Long.parseLong(teamCode);
            List list = labelInfoService.findNoHealthSignFamilyHealth(filter, team,page,pagesize);
            List list = labelInfoService.findNoHealthSignFamilyHealth(filter, team, page, pagesize);
            return write(200, "查询成功！", "data", list);
        } catch (Exception e) {
            error(e);
@@ -146,9 +146,9 @@ public class SignPatientLabelInfoController extends BaseController {
    @ApiOperation("查询某个团队的某个标签下的患者信息")
    public String getPatientInfoByLabel(@RequestParam(required = false) String labelCode,
                                        @RequestParam(required = false) String labelType,
                                        @RequestParam(required = false)Long teamCode,
                                        @RequestParam(required = false)int page,
                                        @RequestParam(required = false)int pagesize) {
                                        @RequestParam(required = false) Long teamCode,
                                        @RequestParam(required = false) int page,
                                        @RequestParam(required = false) int pagesize) {
        try {
            if (StringUtils.isEmpty(labelCode)) {
                return error(-1, "标签cdoe不能为空");
@@ -161,8 +161,8 @@ public class SignPatientLabelInfoController extends BaseController {
            }
            page = page - 1;
            if(labelType.equals("9")){
                JSONObject jsonObject = signWebService.getOverDuePatients(labelCode,teamCode,getUID(),page,pagesize);
            if (labelType.equals("9")) {
                JSONObject jsonObject = signWebService.getOverDuePatients(labelCode, teamCode, getUID(), page, pagesize);
                return write(200, "查询成功", "data", jsonObject);
            }
@@ -234,8 +234,8 @@ public class SignPatientLabelInfoController extends BaseController {
            page = page > 0 ? page - 1 : 0;
            if(labelType.equals("9")){
                JSONObject jsonObject = signWebService.getOverDuePatientsByTeam(labelCode,teamCode,page,pagesize);
            if (labelType.equals("9")) {
                JSONObject jsonObject = signWebService.getOverDuePatientsByTeam(labelCode, teamCode, page, pagesize);
                return write(200, "查询成功", "data", jsonObject);
            }
@@ -250,11 +250,12 @@ public class SignPatientLabelInfoController extends BaseController {
    /**
     * pc端im使用
     *
     * @return
     */
    @RequestMapping(value = "/doctor_team_patient", method = RequestMethod.GET)
    @ApiOperation(value = "获取医生所有团队的所有居民")
    public String getDoctorTeamsPatient(){
    public String getDoctorTeamsPatient() {
        try {
            JSONArray result = labelInfoService.getSignPatientsByDoctorCode(getUID());
            return write(200, "查询成功", "data", result);
@@ -272,7 +273,7 @@ public class SignPatientLabelInfoController extends BaseController {
     */
    @RequestMapping(value = "/label_patient_amount")
    @ApiOperation("查询某个团队的某个标签类型下各标签患者数")
    public String getPatientAmountByLabelType(@RequestParam(required = false)String labelType, @RequestParam(required = false) Long teamCode) {
    public String getPatientAmountByLabelType(@RequestParam(required = false) String labelType, @RequestParam(required = false) Long teamCode) {
        try {
            if (StringUtils.isEmpty(labelType)) {
                return error(-1, "标签类型不能为空");
@@ -283,13 +284,13 @@ public class SignPatientLabelInfoController extends BaseController {
            }
            //计算年度数目
            if(labelType.equals("9")){
                JSONObject r= signWebService.getRenewYearCountByDoctor(teamCode,getUID());
            if (labelType.equals("9")) {
                JSONObject r = signWebService.getRenewYearCountByDoctor(teamCode, getUID());
                return write(200, "查询成功", "data", r);
            }
            if(labelType.equals("1")&&teamCode!=0L){
                JSONArray r= patientService.getSignByDoctorCodeGpbyServer(getUID(),teamCode+"");
            if (labelType.equals("1") && teamCode != 0L) {
                JSONArray r = patientService.getSignByDoctorCodeGpbyServer(getUID(), teamCode + "");
                //JSONArray r= patientService.getSignByDoctorCodeGpbyServer("xh1D201703150222",teamCode+"");
                return write(200, "查询成功", "data", r);
            }
@@ -322,14 +323,14 @@ public class SignPatientLabelInfoController extends BaseController {
            if (teamCode == null) {
                teamCode = 0L;
            }
            if("1".equals(labelType)){
                JSONArray result =patientService.getSignByTeamCodeGpbyServer(teamCode);
                return  write(200, "查询成功", "data", result);
            if ("1".equals(labelType)) {
                JSONArray result = patientService.getSignByTeamCodeGpbyServer(teamCode);
                return write(200, "查询成功", "data", result);
            }
            //计算年度数目
            if(labelType.equals("9")){
                JSONObject r= signWebService.getRenewYearCount(teamCode);
            if (labelType.equals("9")) {
                JSONObject r = signWebService.getRenewYearCount(teamCode);
                return write(200, "查询成功", "data", r);
            }
@@ -494,12 +495,12 @@ public class SignPatientLabelInfoController extends BaseController {
    @RequestMapping(value = "/patient_search_Overdue")
    @ApiOperation("查询某个患者的某类标签根据团队和当前医生")
    public String searchPatientByNameOrLabelOverdue(@RequestParam(required = true) String filter,
                                             @RequestParam(required = false) String labelCode,
                                             @RequestParam(required = false) String labelType,
                                             @RequestParam(required = false) Long teamCode,
                                             @RequestParam(required = false) String exLabelCode,
                                             @RequestParam(required = false) String exLabelType,
                                             @RequestParam(required = true) int page, @RequestParam(required = true) int pagesize) {
                                                    @RequestParam(required = false) String labelCode,
                                                    @RequestParam(required = false) String labelType,
                                                    @RequestParam(required = false) Long teamCode,
                                                    @RequestParam(required = false) String exLabelCode,
                                                    @RequestParam(required = false) String exLabelType,
                                                    @RequestParam(required = true) int page, @RequestParam(required = true) int pagesize) {
        try {
            if (StringUtils.isEmpty(filter)) {
                return error(-1, "搜索字段不能为空");
@@ -529,7 +530,6 @@ public class SignPatientLabelInfoController extends BaseController {
    }
    @RequestMapping(value = "/patient_search_all", method = RequestMethod.GET)
    @ApiOperation("根据姓名搜索所有团队下居民（根据团队和当前医生）")
    public String searchPatients(@RequestParam(required = true) String filter,
@@ -613,6 +613,7 @@ public class SignPatientLabelInfoController extends BaseController {
    /**
     * 签约过期的居民
     *
     * @param filter
     * @param teamCode
     * @param page
@@ -622,9 +623,9 @@ public class SignPatientLabelInfoController extends BaseController {
    @RequestMapping(value = "/patient_search_all_exitdoc_overdue", method = RequestMethod.GET)
    @ApiOperation("根据姓名搜索所有团队下居民（根据团队）")
    public String searchPatientsExitDocOverdue(@RequestParam(required = true) String filter,
                                        @RequestParam(required = true, defaultValue = "0") long teamCode,
                                        @RequestParam(required = false, defaultValue = "0") int page,
                                        @RequestParam(required = false, defaultValue = "15") int pagesize) {
                                               @RequestParam(required = true, defaultValue = "0") long teamCode,
                                               @RequestParam(required = false, defaultValue = "0") int page,
                                               @RequestParam(required = false, defaultValue = "15") int pagesize) {
        try {
            if (StringUtils.isEmpty(filter)) {
                return error(-1, "查询参数不能为空");