签约日期修改

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -86,9 +86,9 @@ public class SignPatientLabelInfoService extends BaseService {
                    " where " + (doc.getLevel() == 2 ? " doctor" : "doctor_health") + " = ? and status > 0 and admin_team_code = ? ";
            if (labelCode.equals("1")) {
                int week = today.get(Calendar.DAY_OF_WEEK) - 1;
                int week = today.get(Calendar.DAY_OF_WEEK) - 2;
                if (week == 0) {
                if (week == -1) {
                    week = 6;
                }
                startDate.add(Calendar.DATE, -week);
@@ -99,7 +99,7 @@ public class SignPatientLabelInfoService extends BaseService {
                sql += " and apply_date between '" + (df.format(startDate.getTime()) + " 00:00:00")
                        + "' and '" + (df.format(today.getTime()) + " 23:59:59'");
            } else if (labelCode.equals("3")) {
                startDate.add(Calendar.DATE, 29);
                startDate.add(Calendar.DATE, 30);
                sql += " and end between '" + (df.format(today.getTime()) + " 00:00:00")
                        + "' and '" + (df.format(startDate.getTime()) + " 23:59:59'");
            } else {
@@ -352,7 +352,7 @@ public class SignPatientLabelInfoService extends BaseService {
                        sql += " and apply_date between '" + (df.format(startDate.getTime()) + " 00:00:00")
                                + "' and '" + (df.format(today.getTime()) + " 23:59:59'");
                    } else if (label.getLabelCode().equals("3")) {
                        startDate.add(Calendar.DATE, 29);
                        startDate.add(Calendar.DATE, 30);
                        sql += " and end between '" + (df.format(today.getTime()) + " 00:00:00")
                                + "' and '" + (df.format(startDate.getTime()) + " 23:59:59'");
                    } else {

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

@@ -77,7 +77,7 @@ public class DoctorDeviceController extends BaseController {
	 * 设备删除
	 */
	@ApiOperation("设备删除--医生端")
	@RequestMapping(value = "DeletePatientDevice",method = RequestMethod.DELETE)
	@RequestMapping(value = "DeletePatientDevice")
	@ResponseBody
	public String delete(@ApiParam(name="id",value="删除设备关联ID")
						 @RequestParam(value="id",required = true) String id) {

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

@@ -782,7 +782,14 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    String idcard = sf.getIdcard();
                    if (StringUtils.isNotBlank(idcard) && (idcard.length() == 15 || idcard.length() == 18)) {
                        json.put("age", IdCardUtil.getAgeForIdcard(idcard));//患者年龄
                        json.put("sex", IdCardUtil.getSexForIdcard(idcard));//患者性别
                        String sex = IdCardUtil.getSexForIdcard(idcard);
                        if(sex.equals("1")){
                            json.put("sex","2");//患者性别
                        } else if(sex.equals("2")){
                            json.put("sex","1");//患者性别
                        }else{
                            json.put("sex",sex);//患者性别
                        }
                    } else {
                        json.put("age", "");//患者年龄
                        json.put("sex", "");//患者性别