慢病管理

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@@ -427,9 +427,29 @@ public class PatientService extends TokenService {
    public JSONObject checkCanRenewNew(String patient){
        JSONObject rs = new JSONObject();
        //判断是否有生效记录SQL
        String sql = "SELECT t.id,t.sign_year signYear FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status>=0 AND t.expenses_status='1'";
        return null;
        String sql = "SELECT t.id,t.sign_year signYear FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status>=0";
        List<Map<String,Object>> signs =  jdbcTemplate.queryForList(sql);
        if(!signs.isEmpty()){
            rs.put("mes", "当前年度已经签约");
            rs.put("code", "-2");
            return rs;
        }
        //判读是否有旧的已到期记录SQL
        String oldSignSql = "SELECT t.id,t.sign_year signYear,t.status FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status=-4 AND  t.expenses_status='1' AND t.sign_year ='" + (DateUtil.getSignYear() - 1) + "'";
        List<Map<String,Object>> oldSigns =  jdbcTemplate.queryForList(oldSignSql);
        if(!oldSigns.isEmpty()){
            rs.put("mes", "可以续签(已到期)");
            rs.put("code", "2");
            return rs;
        }else{
            //没有签约记录,不允许续签,提示前往签约
            rs.put("mes", "没有签约记录,请前往签约");
            rs.put("code", "-4");
            return rs;
        }
    }
    /**

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/DateUtil.java

@@ -861,7 +861,7 @@ public class DateUtil {
	public static int getSignYear(){
		Calendar ca = Calendar.getInstance();
		if(getNowMonth()>=4){
		if(getNowMonth()>=7){
			return getNowYear();
		}
		return getNowYear()-1;

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

@@ -496,30 +496,9 @@ public class DoctorSignController extends WeixinBaseController {
                             @RequestParam(required = false) Long teamCode,
                             @RequestParam(required = false) String expenses){
        try{
            //判断是否存在下个年度续签
            int isNowYearSign = signWebService.checkNowYearSign(getUID(),patient);
            if(isNowYearSign==0){
                //设置代码为已读
                signWebService.setMessState(mesId);
                return  write(200, "已经存在下个年度的签约关系", "data", -1);
            }
            Calendar cal = Calendar.getInstance();
            int year = cal.get(Calendar.YEAR);
            int month = cal.get(Calendar.MONTH)+1;
            //屏蔽了预签约
            int rs = 0;
            if(month<7){
                rs =signWebService.agreeRenew(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
//            int rs =signWebService.agreeRenew(getAccessToken(),"test00000000005",patient,state);
            }else{
//                rs =signWebService.agreeRenew(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
//                //如果没有续签记录,走签约记录
//                if(rs!=0){
//                    rs =signWebService.agreeRenewOverDue(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
//                }
                rs =signWebService.agreeRenewOverDue(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
            }
            rs =signWebService.agreeRenewOverDue(getAccessToken(),getUID(),patient,state,mesId,"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
            if(rs != 1){
                //设置代码为已读
                signWebService.setMessState(mesId);
@@ -527,6 +506,38 @@ public class DoctorSignController extends WeixinBaseController {
            }else{
                return write(200, "操作成功！", "data", rs);
            }
//            //判断是否存在下个年度续签
//            int isNowYearSign = signWebService.checkNowYearSign(getUID(),patient);
//            if(isNowYearSign==0){
//                //设置代码为已读
//                signWebService.setMessState(mesId);
//                return  write(200, "已经存在下个年度的签约关系", "data", -1);
//            }
//            Calendar cal = Calendar.getInstance();
//            int year = cal.get(Calendar.YEAR);
//            int month = cal.get(Calendar.MONTH)+1;
//            int rs = 0;
//            if(month<7){
//                rs =signWebService.agreeRenew(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
////            int rs =signWebService.agreeRenew(getAccessToken(),"test00000000005",patient,state);
//            }else{
////                rs =signWebService.agreeRenew(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
////                //如果没有续签记录,走签约记录
////                if(rs!=0){
////                    rs =signWebService.agreeRenewOverDue(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
////                }
//                rs =signWebService.agreeRenewOverDue(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
//
//            }
//            if(rs != 1){
//                //设置代码为已读
//                signWebService.setMessState(mesId);
//                return  write(200, "未找到签约记录", "data", rs);
//            }else{
//                return write(200, "操作成功！", "data", rs);
//            }
        }catch (Exception e){
            error(e);
            return error(-1, "请求失败");
@@ -621,7 +632,9 @@ public class DoctorSignController extends WeixinBaseController {
    @ResponseBody
    public String checkCanRenew(@RequestParam(required = true) String patient){
        try {
            JSONObject result = patientService.checkCanSignRenew(patient);
            //JSONObject result = patientService.checkCanSignRenew(patient);
            JSONObject result = patientService.checkCanRenewNew(patient);
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            return error(-1, "查询失败");

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

@@ -473,16 +473,17 @@ public class FamilyContractController extends BaseController {
            if (StringUtils.isEmpty(doctor)) {
                return error(-1, "签约医生不能为空");
            }
            Calendar cal = Calendar.getInstance();
            int month = cal.get(Calendar.MONTH)+1;
//            Calendar cal = Calendar.getInstance();
//            int month = cal.get(Calendar.MONTH)+1;
//            int result = -1;
//            if(month<7){
//                result = familyContractService.signRenew(doctor,healthDoctor,patient,reason,medicareNumber);
//            }else{
//                //1.3.5新增居委会字段
//                result = familyContractService.signRenewOverdue(doctor,healthDoctor,patient,reason,countryCode,medicareNumber);
//            }
            int result = -1;
            if(month<7){
                result = familyContractService.signRenew(doctor,healthDoctor,patient,reason,medicareNumber);
            }else{
                //1.3.5新增居委会字段
                result = familyContractService.signRenewOverdue(doctor,healthDoctor,patient,reason,countryCode,medicareNumber);
            }
            result = familyContractService.signRenewOverdue(doctor,healthDoctor,patient,reason,countryCode,medicareNumber);
            if (result == -1) {
                return error(-1, "用户信息查询失败");
@@ -698,7 +699,8 @@ public class FamilyContractController extends BaseController {
    @ApiOperation("验证是否允许签约")
    public String checkCanRenew(@RequestParam(required = true) String patient){
        try {
            JSONObject result = patientService.checkCanSignRenew(patient);
            //JSONObject result = patientService.checkCanSignRenew(patient);
            JSONObject result = patientService.checkCanRenewNew(patient);
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            error(e);