From 8a71c967959bdd86c2af41bf4e24c6c698a40dfe Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 26 Jun 2024 19:09:53 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=A4=A7=E5=90=8C?= =?UTF-8?q?=E6=AF=8D=E5=AD=90=E7=AE=A1=E7=90=86=E6=89=8B=E5=86=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/service/impl/LisServiceImpl.java | 2 +- .../operate/web/facade/BookbuildingFacade.java | 343 ++++++++++----------- .../operate/web/result/PregnantInfoResult.java | 9 + 3 files changed, 181 insertions(+), 173 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 90dda1a..55111b4 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -585,7 +585,7 @@ public class LisServiceImpl implements LisService { List recordModels= antExRecordService.queryAntExRecords(antExRecordQuery); AntExRecordModel antExRecordModel = new AntExRecordModel(); - antExRecordModel.setType(2); + //antExRecordModel.setType(2); antExRecordModel.setHospitalId(patients.getHospitalId()); antExRecordModel.setLastMenses(patients.getLastMenses()); antExRecordModel.setName(patients.getUsername()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 0f2f55f..49667c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -289,7 +289,7 @@ public class BookbuildingFacade { } } } - if (StringUtils.isNotEmpty(yunRequest.getHighRiskFileCode())){ + if (StringUtils.isNotEmpty(yunRequest.getHighRiskFileCode())) { patientsQuery.setCardNo(null); patientsQuery.setPhone(null); patientsQuery.setHighRiskFileCode(yunRequest.getHighRiskFileCode()); @@ -395,38 +395,38 @@ public class BookbuildingFacade { patient.setScreening(yunRequest.getScreening());//特殊产筛建档 //如果建档医生是空则创建医生 - if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())){ - - Integer dockerId= usersService.getUserId(patient.getHospitalId(),yunRequest.getLastCheckEmployeeName()); - if (dockerId!=null){ - patient.setLastCheckEmployeeId(String.valueOf(dockerId)); - }else { - if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())){ - //准备添加数据 - Users users = new Users(); - users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 - //users.setDeptId(deptId); - users.setOrgId(Integer.valueOf(patient.getHospitalId())); - users.setName(yunRequest.getLastCheckEmployeeName()); - users.setAccount(yunRequest.getLastCheckEmployeeName()); - //users.setPhone(phone); - users.setEnable(1); - // users.setZhiChenId(zhiCId); - users.setPwd(MD5Utils.md5("123456").toUpperCase()); - //users.setRemarks(remarks); - // users.setKsId(ksId); - // users.setPublishId(user.getId()); - // users.setPublishName(user.getName()); - users.setYn(YnEnums.YES.getId()); - users.setModified(new Date()); - users.setCreated(new Date()); - // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); - // user.setDefaultPage(defaultPage); - usersService.addUsers(users); - patient.setLastCheckEmployeeId(String.valueOf(users.getId())); - } - - } + if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) { + + Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName()); + if (dockerId != null) { + patient.setLastCheckEmployeeId(String.valueOf(dockerId)); + } else { + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) { + //准备添加数据 + Users users = new Users(); + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 + //users.setDeptId(deptId); + users.setOrgId(Integer.valueOf(patient.getHospitalId())); + users.setName(yunRequest.getLastCheckEmployeeName()); + users.setAccount(yunRequest.getLastCheckEmployeeName()); + //users.setPhone(phone); + users.setEnable(1); + // users.setZhiChenId(zhiCId); + users.setPwd(MD5Utils.md5("123456").toUpperCase()); + //users.setRemarks(remarks); + // users.setKsId(ksId); + // users.setPublishId(user.getId()); + // users.setPublishName(user.getName()); + users.setYn(YnEnums.YES.getId()); + users.setModified(new Date()); + users.setCreated(new Date()); + // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); + // user.setDefaultPage(defaultPage); + usersService.addUsers(users); + patient.setLastCheckEmployeeId(String.valueOf(users.getId())); + } + + } } //生成条形码 @@ -597,7 +597,7 @@ public class BookbuildingFacade { Patients patients = new Patients(); if (StringUtils.isNotEmpty(list.get(0).getAssistUserId()) && StringUtils.isNotEmpty(tempP.getId())) { patients.setAssistUserId(list.get(0).getAssistUserId()); - }else { + } else { patients.setAssistUserId(tempP.getBookbuildingDoctor()); archiveData.setAssistUserId(tempP.getBookbuildingDoctor()); } @@ -1221,7 +1221,7 @@ public class BookbuildingFacade { private void sendbuildingMsg(Patients patient, Integer subTypeId, String first, String keyWord1, String remark) { if ("1000000016".equals(patient.getHospitalId())) { try { - // Thread.sleep(5000); + // Thread.sleep(5000); logger.info("sendbuildingMsg startup"); List messages = new ArrayList<>(); MsgRequest mr = new MsgRequest(); @@ -1412,114 +1412,115 @@ public class BookbuildingFacade { @Autowired private AppointmentService appointmentService; - public void bookbuildingMsg(){ + public void bookbuildingMsg() { //TODO 大同早上7点推送未建档提醒 - String date= DateUtil.getyyyy_MM_dd(new Date()); - String startTime=date+" 00:00:00"; - String endTime=date+" 23:59:59"; - List modelList= appointmentService.queryAppointment("孙慧洁",startTime,endTime,null,null); - if (CollectionUtils.isNotEmpty(modelList)){ - PatientsQuery patientsQuery =new PatientsQuery(); - patientsQuery.setYn(1); - patientsQuery.setHospitalId("2100002419"); - List sendList=new ArrayList<>(); - for (int i = 0,j=modelList.size(); i < j; i++) { - AppointmentModel appointmentModel= modelList.get(i); - String idCard=appointmentModel.getIdCard(); - String phone=appointmentModel.getPhone(); - String username=appointmentModel.getName(); - if (StringUtils.isNotEmpty(idCard)){ - patientsQuery.setCardNo(idCard); - }else { - if (StringUtils.isNotEmpty(username)&&StringUtils.isNotEmpty(phone)){ - patientsQuery.setName(username); - patientsQuery.setPhone(phone); - }else { - appointmentModel.setIsBuild(0); - } - } - if (appointmentModel.getIsBuild()==null){ - List patientsList= patientsService.queryPatient(patientsQuery); - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientsList)){ - appointmentModel.setIsBuild(1); - }else { - appointmentModel.setIsBuild(0); - } - } - if (appointmentModel.getIsBuild()==0){ - sendList.add(appointmentModel); - } + String date = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),1)); + String startTime = date + " 00:00:00"; + String endTime = date + " 23:59:59"; + List modelList = appointmentService.queryAppointment("孙慧洁", startTime, endTime, null, null); + if (CollectionUtils.isNotEmpty(modelList)) { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(1); + patientsQuery.setHospitalId("2100002419"); + List sendList = new ArrayList<>(); + for (int i = 0, j = modelList.size(); i < j; i++) { + AppointmentModel appointmentModel = modelList.get(i); + String idCard = appointmentModel.getIdCard(); + String phone = appointmentModel.getPhone(); + String username = appointmentModel.getName(); + if (StringUtils.isNotEmpty(idCard)) { + patientsQuery.setCardNo(idCard); + } else { + if (StringUtils.isNotEmpty(username) && StringUtils.isNotEmpty(phone)) { + patientsQuery.setName(username); + patientsQuery.setPhone(phone); + } else { + appointmentModel.setIsBuild(0); } - if (CollectionUtils.isNotEmpty(sendList)){ - sendAppointmentMsg(sendList,date); + } + if (appointmentModel.getIsBuild() == null) { + List patientsList = patientsService.queryPatient(patientsQuery); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientsList)) { + appointmentModel.setIsBuild(1); + } else { + appointmentModel.setIsBuild(0); } } + if (appointmentModel.getIsBuild() == 0) { + sendList.add(appointmentModel); + } + } + if (CollectionUtils.isNotEmpty(sendList)) { + sendAppointmentMsg(sendList, date); + } + } - } + } - public void sendAppointmentMsg(List appointmentModels,String date){ - try { - logger.info("sendAppointmentMsg startup"); - // Thread.sleep(3000); - List messages = new ArrayList<>(); - final String hospitalId ="2100002419"; - for (AppointmentModel appointmentModel:appointmentModels){ - MsgRequest request = new MsgRequest(); - String title = "建档提醒短信"; - String messageContent = "【大同市第一人民医院】提醒您：您还未在我院建立孕期档案，为了更好的给您提供产检服务，请尽快携带身份证、母子健康手册以及产检检查资料前往我院门诊二层孕妇网络中心进行建档。" + - "温馨提示：“母子健康手册”在个人居住地社区卫生服务机构领取（需携带孕妇身份证明及产检资料）。"; - request.setServiceType(3); - //短信发送状态 - request.setSmsStatus(SmsStatusEnums.WFS.getId()); - //平台ID - request.setTypeId(ProjectTypeEnums.YNXT.getId()); - //服务对象 1孕妇 2儿童 3产妇 - request.setObjType(1); - request.setWxTempId("tx-UmDE3YMgYaAeFccXB7HITuG_tiP9LMdX2bvBpus"); - request.setPhone(appointmentModel.getPhone()); - request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - request.setSubTypeId(SmsServiceEnums.FWKT.getId()); - request.setStatus(MsgStatusEnums.NO_SEND.getId()); - request.setTimeType(1); - request.setHospitalId(hospitalId); - request.setPatientId(appointmentModel.getVccardNo()); - request.setTempId(appointmentModel.getVccardNo()); - request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); - request.setFirst(messageContent); - request.setKeyword1(title); - request.setKeyword2(date); - messages.add(request); - } - smsConfigFacade.saveMsg(messages, hospitalId); - logger.info("sendAppointmentMsg end"); - } catch (Exception e) { - logger.error("sendAppointmentMsg Exception " + e); + public void sendAppointmentMsg(List appointmentModels, String date) { + try { + logger.info("sendAppointmentMsg startup"); + // Thread.sleep(3000); + List messages = new ArrayList<>(); + final String hospitalId = "2100002419"; + for (AppointmentModel appointmentModel : appointmentModels) { + MsgRequest request = new MsgRequest(); + String title = "建档提醒短信"; + String messageContent = "【大同市第一人民医院】提醒您：您还未在我院建立孕期档案，为了更好的给您提供产检服务，请尽快携带身份证、母子健康手册以及产检检查资料前往我院门诊二层孕妇网络中心进行建档。" + + "温馨提示：“母子健康手册”在个人居住地社区卫生服务机构领取（需携带孕妇身份证明及产检资料）。"; + request.setServiceType(3); + //短信发送状态 + request.setSmsStatus(SmsStatusEnums.WFS.getId()); + //平台ID + request.setTypeId(ProjectTypeEnums.YNXT.getId()); + //服务对象 1孕妇 2儿童 3产妇 + request.setObjType(1); + request.setWxTempId("tx-UmDE3YMgYaAeFccXB7HITuG_tiP9LMdX2bvBpus"); + request.setPhone(appointmentModel.getPhone()); + request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); + request.setSubTypeId(SmsServiceEnums.FWKT.getId()); + request.setStatus(MsgStatusEnums.NO_SEND.getId()); + request.setTimeType(1); + request.setHospitalId(hospitalId); + request.setPatientId(appointmentModel.getVccardNo()); + request.setTempId(appointmentModel.getVccardNo()); + request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + request.setFirst(messageContent); + request.setKeyword1(title); + request.setKeyword2(date); + messages.add(request); } + smsConfigFacade.saveMsg(messages, hospitalId); + logger.info("sendAppointmentMsg end"); + } catch (Exception e) { + logger.error("sendAppointmentMsg Exception " + e); + } } - private static final long TIMES = 24 * 60 * 60 * 1000 - 1; + private static final long TIMES = 24 * 60 * 60 * 1000 - 1; + /** * 大同下午18点推送预建档未审核提醒 */ public void archiveServiceSync() { - ArchiveDataQuery archiveDataQuery =new ArchiveDataQuery(); + ArchiveDataQuery archiveDataQuery = new ArchiveDataQuery(); archiveDataQuery.setHospitalId("2100002419"); Date start = DateUtil.getYMDTime(); Date end = new Date(start.getTime() + TIMES); archiveDataQuery.setCreatedStart(start); archiveDataQuery.setCreatedEnd(end); archiveDataQuery.setHasBuildDate(false); - final List archiveDataList= archiveDataServicer.query(archiveDataQuery.convertToQuery()); + final List archiveDataList = archiveDataServicer.query(archiveDataQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(archiveDataList)){ + if (CollectionUtils.isNotEmpty(archiveDataList)) { new Thread(new Runnable() { @Override public void run() { for (int i = 0, j = archiveDataList.size(); i < j; i++) { - ArchiveData archiveData= archiveDataList.get(i); + ArchiveData archiveData = archiveDataList.get(i); sendArchiveMsg(archiveData); } } @@ -1529,8 +1530,8 @@ public class BookbuildingFacade { } - public void sendArchiveMsg(ArchiveData archiveData){ - if ("2100002419".equals(archiveData.getHospitalId())){ + public void sendArchiveMsg(ArchiveData archiveData) { + if ("2100002419".equals(archiveData.getHospitalId())) { try { logger.info("sendArchiveMsg startup"); List messages = new ArrayList<>(); @@ -1583,7 +1584,7 @@ public class BookbuildingFacade { Date twenty = DateUtil.addDay(day, -21); Date twentyEight = DateUtil.addDay(day, -28); Map params = new HashMap<>(); - /* params.put("day",day);*/ + /* params.put("day",day);*/ params.put("seven", seven); params.put("fourteen", fourteen); params.put("twenty", twenty); @@ -1749,21 +1750,21 @@ public class BookbuildingFacade { } } if (StringUtils.isNotEmpty(yunRequest.getHighRiskFileCode())) { - if (pat != null){ - if(StringUtils.isEmpty(pat.getHighRiskFileCode()) ||!yunRequest.getHighRiskFileCode().equals(pat.getHighRiskFileCode())) { - patientsQuery.setCardNo(null); - patientsQuery.setPhone(null); - patientsQuery.setHighRiskFileCode(yunRequest.getHighRiskFileCode()); - //判断该手机号码在 孕期内有没有建档 - patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(patients)) { - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该高危专号已存在"); - return br; + if (pat != null) { + if (StringUtils.isEmpty(pat.getHighRiskFileCode()) || !yunRequest.getHighRiskFileCode().equals(pat.getHighRiskFileCode())) { + patientsQuery.setCardNo(null); + patientsQuery.setPhone(null); + patientsQuery.setHighRiskFileCode(yunRequest.getHighRiskFileCode()); + //判断该手机号码在 孕期内有没有建档 + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) { + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该高危专号已存在"); + return br; + } } } } - } // if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && !pat.getVcCardNo().equals(yunRequest.getVcCardNo())) { // // //就诊卡号判断 @@ -1784,8 +1785,6 @@ public class BookbuildingFacade { } - - Patients patient = getPatientsData(yunRequest); patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId()); patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime())); @@ -1843,18 +1842,18 @@ public class BookbuildingFacade { }*/ //如果建档医生是空则创建医生 - if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())){ + if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) { - Integer dockerId= usersService.getUserId(hospitalId,yunRequest.getLastCheckEmployeeName()); - if (dockerId!=null){ + Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName()); + if (dockerId != null) { patient.setLastCheckEmployeeId(String.valueOf(dockerId)); - }else { - if(StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())){ + } else { + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) { //准备添加数据 Users users = new Users(); users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 //users.setDeptId(deptId); - users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId())?patient.getHospitalId():hospitalId)); + users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId()) ? patient.getHospitalId() : hospitalId)); users.setName(yunRequest.getLastCheckEmployeeName()); users.setAccount(yunRequest.getLastCheckEmployeeName()); //users.setPhone(phone); @@ -3008,6 +3007,7 @@ public class BookbuildingFacade { result.setLastCheckEmployeeId(p.getLastCheckEmployeeId()); result.setUserType(p.getUserType()); result.setDept(p.getDept()); + result.setLowerHairOgr(p.getLowerHairOgr()); return result; } @@ -3732,22 +3732,22 @@ public class BookbuildingFacade { return patientId; } - public BaseResponse deleteVideo(String fileName){ + public BaseResponse deleteVideo(String fileName) { BaseObjectResponse objectResponse = new BaseObjectResponse(); try { - String arrays[]= fileName.split("/id_photo"); - if (arrays.length>1){ - File file = new File(BASE_IMG_PATH +arrays[1]); + String arrays[] = fileName.split("/id_photo"); + if (arrays.length > 1) { + File file = new File(BASE_IMG_PATH + arrays[1]); file.delete(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; - }else { + } else { objectResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); objectResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); return objectResponse; } - }catch (Exception e){ + } catch (Exception e) { ExceptionUtils.catchException(e, "上传文件发生异常"); objectResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); objectResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); @@ -3763,15 +3763,15 @@ public class BookbuildingFacade { try { //临时路径 - String tempsDirPath="tempsDir"; + String tempsDirPath = "tempsDir"; //创建临时文件储存目录 File tempsDir = new File(BASE_IMG_PATH + File.separator + tempsDirPath, fileName); if (!tempsDir.exists()) { tempsDir.mkdirs(); } //储存为临时文件 - System.out.println(tempsDir.getAbsolutePath()+"/"+fileName+".part"+ chunk); - File tempFile = new File(tempsDir.getAbsolutePath()+"/"+fileName+".part"+ chunk); + System.out.println(tempsDir.getAbsolutePath() + "/" + fileName + ".part" + chunk); + File tempFile = new File(tempsDir.getAbsolutePath() + "/" + fileName + ".part" + chunk); file.transferTo(tempFile); //检查分片是否下载完成 int successChunks = FileUtils.getInstance().successChunks(fileName, chunks); @@ -3781,7 +3781,7 @@ public class BookbuildingFacade { String imgPath = DateUtil.getYmd(new Date()); //分片下载完成后合并分片为文件 FileUtils.getInstance().mergeChunks(tempsDir.getAbsolutePath(), - BASE_IMG_PATH + File.separator +imgPath + BASE_IMG_PATH + File.separator + imgPath , fileName, chunks); //返回文件地址 objectResponse.setData(imgPath + "/" + fileName); @@ -4572,32 +4572,31 @@ public class BookbuildingFacade { } } - public void testInit(){ - AntExRecordQuery antExRecordQuery=new AntExRecordQuery(); - antExRecordQuery.setType(2); + public void testInit() { + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setType(1); antExRecordQuery.setHospitalId("2100002419"); - List recordModels= antExRecordService.queryAntExRecords(antExRecordQuery); - if (CollectionUtils.isNotEmpty(recordModels)){ - for (AntExRecordModel antExRecordModel : recordModels){ - List hRisk= antExRecordModel.gethRisk(); - if (CollectionUtils.isNotEmpty(hRisk)){ - antExRecordModel.sethRisk(hRisk); - antExRecordModel.sethLevel(antExRecordModel.gethLevel()); - antExRecordModel.sethScore(antExRecordModel.gethScore()); - }else { - AntExRecordModel antExRecordModel1= recordModels.get(recordModels.size()-1); - antExRecordModel.sethRisk(antExRecordModel1.gethRisk()); - antExRecordModel.sethLevel(antExRecordModel1.gethLevel()); - antExRecordModel.sethScore(antExRecordModel1.gethScore()); - } - - antExRecordService.updateOne(antExRecordModel,antExRecordModel.getId()); - } - } - - + List recordModels = antExRecordService.queryAntExRecords(antExRecordQuery); + if (CollectionUtils.isNotEmpty(recordModels)) { + for (AntExRecordModel antExRecordModel : recordModels) { + List hRisk = antExRecordModel.gethRisk(); + if (CollectionUtils.isEmpty(hRisk)) { + antExRecordQuery.setType(2); + antExRecordQuery.setParentId(antExRecordModel.getParentId()); + List antExRecordModels = antExRecordService.queryAntExRecords(antExRecordQuery); + if (CollectionUtils.isNotEmpty(antExRecordModels)) { + if (CollectionUtils.isNotEmpty(antExRecordModels.get(0).gethRisk())) { + antExRecordModel.sethRisk(antExRecordModels.get(0).gethRisk()); + antExRecordModel.sethLevel(antExRecordModels.get(0).gethLevel()); + antExRecordModel.sethScore(antExRecordModels.get(0).gethScore()); + antExRecordService.updateOne(antExRecordModel, antExRecordModel.getId()); + } + } + } + } + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 2a9570e..d35601a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -58,6 +58,15 @@ public class PregnantInfoResult { //大同职工专属 1为是 0为否 private Integer userType; private String dept; + private String lowerHairOgr; + + public String getLowerHairOgr() { + return lowerHairOgr; + } + + public void setLowerHairOgr(String lowerHairOgr) { + this.lowerHairOgr = lowerHairOgr; + } public String getDept() { return dept; -- 1.8.3.1