diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java index c08d4ca..2b0cebe 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java @@ -41,6 +41,8 @@ public interface IPatientDao { List aggregateOne(MongoQuery mongoQuery); + List aggregatbookbuildingDoctore(MongoQuery mongoQuery); + public void updatePatientHusbandBirth(String id, Object colValue); List queryPatientAnxtchuCount(MongoQuery query); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java index d87dfde..ea018f6 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java @@ -166,4 +166,15 @@ public class PatientDaoImpl extends BaseMongoDAOImpl implements IPatie AggregationResults result = mongoTemplate.aggregate(aggregation, "lyms_patient", HashMap.class); return result.getMappedResults(); } + + public List aggregatbookbuildingDoctore(MongoQuery mongoQuery) { + AggregationOperation match = Aggregation.match(mongoQuery.getCriteria()); + AggregationOperation group = Aggregation.group("bookbuildingDoctor").count().as("count"); + + Aggregation aggregation = Aggregation.newAggregation(match, group); + + AggregationResults result = mongoTemplate.aggregate(aggregation, "lyms_patient", HashMap.class); + return result.getMappedResults(); + } + } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index ec4f5dd..769c166 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -82,6 +82,11 @@ public class PatientsService { iPatientDao.findAndModify(query.convertToQuery(), obj); } + public List aggregatbookbuildingDoctore(PatientsQuery patientsQuery){ + MongoQuery query = patientsQuery.convertToQuery(); + return iPatientDao.aggregatbookbuildingDoctore(query); + } + public List aggregateOne(PatientsQuery patientsQuery) { MongoQuery query = patientsQuery.convertToQuery(); if (StringUtils.isNotEmpty(patientsQuery.getNeed())) { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index abdbcec..c31b87b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -108,7 +108,7 @@ public class Patients extends BaseModel { //建档日期 private Date bookbuildingDate; - //高危专案档案号 + //高危专案档案号 大同 private String highRiskFileCode; //医院ID @@ -505,6 +505,7 @@ public class Patients extends BaseModel { //产筛结果 private String nipt;//唐氏筛查/无创DNA检测 + public String getGlucm() { return glucm; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 1945e8e..ad1e1ad 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -433,9 +433,21 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Integer isComplete; private String serviceTime; + //大同 高危专号 + private String highRiskFileCode; + + private String nebookbuildingDoctor; private Map mapTime; + public String getNebookbuildingDoctor() { + return nebookbuildingDoctor; + } + + public void setNebookbuildingDoctor(String nebookbuildingDoctor) { + this.nebookbuildingDoctor = nebookbuildingDoctor; + } + public String getServiceTime() { return serviceTime; } @@ -687,6 +699,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.streetRegisterIds = streetRegisterIds; } + public String getHighRiskFileCode() { + return highRiskFileCode; + } + + public void setHighRiskFileCode(String highRiskFileCode) { + this.highRiskFileCode = highRiskFileCode; + } + public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -731,6 +751,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("isHistory", false, MongoOper.EXISTS); } + if (StringUtils.isNotEmpty(highRiskFileCode)){ + condition = condition.and("highRiskFileCode", highRiskFileCode, MongoOper.IS); + } + if (null != isComplete) { condition = condition.and("isComplete", isComplete, MongoOper.IS); } @@ -840,6 +864,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (bookbuildingDoctor != null) { condition = condition.and("bookbuildingDoctor", bookbuildingDoctor, MongoOper.IS); } + + if (null != nebookbuildingDoctor) { + condition = condition.and("bookbuildingDoctor", null, MongoOper.NE); + } + if (CollectionUtils.isNotEmpty(bookbuildingDoctorList)) { condition = condition.and("bookbuildingDoctor", bookbuildingDoctorList, MongoOper.IN); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java index 9fed126..15dc3b5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java @@ -12,7 +12,9 @@ import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.facade.AntExRecordFacade; import com.lyms.platform.operate.web.facade.BasicConfigFacade; +import com.lyms.platform.operate.web.facade.PatientServiceFacade; import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest; +import com.lyms.platform.operate.web.request.JdStatisticsQueryRequest; import com.lymsh.platform.reportdata.model.AreaData; import com.lymsh.platform.reportdata.model.AreaDataQuery; import com.lymsh.platform.reportdata.model.echarts.*; @@ -42,6 +44,8 @@ public class StatisticsController extends BaseController { private AntExRecordFacade antExRecordFacade; @Autowired private BasicConfigFacade basicConfigFacade; + @Autowired + private PatientServiceFacade patientServiceFacade; @@ -1178,6 +1182,14 @@ public class StatisticsController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return antExRecordFacade.queryStatis(loginState.getId(),statisticsQueryRequest); } + @RequestMapping(value = "/jdStatistics", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse jdStatistics(HttpServletRequest request, @Valid JdStatisticsQueryRequest jdStatisticsQueryRequest){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return patientServiceFacade.queryStatistics(loginState.getId(),jdStatisticsQueryRequest); + } + @RequestMapping(value = "/cjStatistics/enums", method = RequestMethod.GET) @ResponseBody @TokenRequired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index c945f41..fa3f0e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -410,8 +410,10 @@ public class AntExRecordFacade { public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) { String hospitalId = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); List patientses = null; - if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) || StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) { + patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); + patientsQuery.setHighRiskFileCode(antExManagerQueryRequest.getHighRiskFileCode()); patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); if (CollectionUtils.isEmpty(patientses)) { @@ -427,6 +429,8 @@ public class AntExRecordFacade { } } + + //威县数据流转 if(OrganizationConstant.XT_WX.equals(hospitalId)){ antExManagerQueryRequest.setCheckDoctor(String.valueOf(userId)); @@ -941,7 +945,9 @@ public class AntExRecordFacade { } } } else { - antExRecordQuery.setNeNullCheckDoctor(true); + if(!StringUtils.isNotEmpty(statisticsQueryRequest.getdId())){ + antExRecordQuery.setNeNullCheckDoctor(true); + } List list = recordService.aggregateOne(antExRecordQuery); for (HashMap map : list) { CjStatisticsResult cjStatisticsResult = new CjStatisticsResult(); 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 4a8386b..889dad3 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,6 +289,20 @@ public class BookbuildingFacade { } } } + if (StringUtils.isNotEmpty(yunRequest.getHighRiskFileCode())){ + patientsQuery.setCardNo(null); + patientsQuery.setPhone(null); + patientsQuery.setHighRiskFileCode(yunRequest.getHighRiskFileCode()); + //判断该手机号码在 孕期内有没有建档 + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该高危专号已存在"); + return br; + } + } + } //就诊卡号判断 // if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { @@ -380,6 +394,38 @@ public class BookbuildingFacade { patient.setOperator(userId); 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 { + //准备添加数据 + 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())); + } + } + //生成条形码 getNumberCode(patient); getTrackHospital(patient); @@ -1539,7 +1585,22 @@ 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 && StringUtils.isNotEmpty(pat.getVcCardNo()) && !pat.getVcCardNo().equals(yunRequest.getVcCardNo())) { // // //就诊卡号判断 @@ -1560,6 +1621,8 @@ public class BookbuildingFacade { } + + Patients patient = getPatientsData(yunRequest); patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId()); patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime())); @@ -1616,6 +1679,38 @@ public class BookbuildingFacade { } }*/ + //如果建档医生是空则创建医生 + if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())){ + + Integer dockerId= usersService.getUserId(patient.getHospitalId(),yunRequest.getLastCheckEmployeeName()); + if (dockerId!=null){ + patient.setLastCheckEmployeeId(String.valueOf(dockerId)); + }else { + //准备添加数据 + 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())); + } + } + patient.setOperator(userId); patient.setScreening(yunRequest.getScreening());//特殊产筛建档 @@ -2479,7 +2574,8 @@ public class BookbuildingFacade { patient.setCloseCaseReason(yunRequest.getCloseCaseReason()); patient.setCloseCaseCode(yunRequest.getCloseCaseCode()); patient.setBuildingManualCode(yunRequest.getBuildingManualCode()); - + patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId()); + patient.setHighRiskFileCode(yunRequest.getHighRiskFileCode()); return patient; } @@ -2739,6 +2835,8 @@ public class BookbuildingFacade { result.setCloseCaseReason(p.getCloseCaseReason()); result.setCloseCaseCode(p.getCloseCaseCode()); result.setBuildingManualCode(p.getBuildingManualCode()); + result.setHighRiskFileCode(p.getHighRiskFileCode()); + result.setLastCheckEmployeeId(p.getLastCheckEmployeeId()); return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index a182e2b..5abcecf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2611,6 +2611,7 @@ public class MatDeliverFacade { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setIsAutoFm(YnEnums.NO.getId()); patientsQuery.setType(3); + patientsQuery.setHighRiskFileCode(childbirthManagerRequest.getHighRiskFileCode()); // 构造医院id集合 List hospitalList = new ArrayList<>(); if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index e6aaaea..99ed609 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -267,6 +267,7 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setNormal(riskPatientsQueryRequest.getNormal()); patientsQuery.setLiveType(riskPatientsQueryRequest.getLiveType()); patientsQuery.setFirstCheckId(riskPatientsQueryRequest.getFirstCheckId()); + patientsQuery.setHighRiskFileCode(riskPatientsQueryRequest.getHighRiskFileCode()); //乡镇卫生院查询条件 if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getTownOrgId())) { patientsQuery.setTownOrgId(riskPatientsQueryRequest.getTownOrgId()); @@ -3225,7 +3226,7 @@ public class PatientFacade extends BaseServiceImpl { //分娩状态 patientsQuery.setDueStatus(null==patientManagerRequest.getDueStatus() ? null : patientManagerRequest.getDueStatus()); patientsQuery.setType(patientManagerRequest.getType()); - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode()); List patientsList = patientsService.queryPatient(patientsQuery); List patientManagerQueryModelList = new ArrayList <>(); if (CollectionUtils.isNotEmpty(patientsList)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 62ab9a6..493791b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1,22 +1,20 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.beans.MsgRequest; -import com.lyms.platform.biz.service.BabyService; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.CommonService; -import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BasePageQueryRequest; -import com.lyms.platform.operate.web.result.BasicConfigResult; -import com.lyms.platform.operate.web.result.PatientSerResult; +import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest; +import com.lyms.platform.operate.web.request.JdStatisticsQueryRequest; +import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.*; @@ -134,7 +132,7 @@ public class PatientServiceFacade { } - public BaseResponse matDeliverServiceInit(Integer id){ + public BaseResponse matDeliverServiceInit(Integer id) { //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); Map map = new HashMap(); @@ -329,7 +327,7 @@ public class PatientServiceFacade { List> mapList = patientServiceService.selectServiceByHospital(hospitalId); if (CollectionUtils.isNotEmpty(mapList)) { logger.info("patientServiceSync mapList is not null"); - final Integer[] serTypes = {1,3, 4, 6}; + final Integer[] serTypes = {1, 3, 4, 6}; PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setHospitalId(hospitalId); patientQuery.setSerTypes(serTypes); @@ -351,7 +349,7 @@ public class PatientServiceFacade { ids.addAll(set); patientsQuery.setIdns(ids); } - final List patientsList = patientsService.queryPatient(patientsQuery); + final List patientsList = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientsList)) { logger.info("patientServiceSync patientsList is not null"); for (int i = 0, j = mapList.size(); i < j; i++) { @@ -411,7 +409,7 @@ public class PatientServiceFacade { patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); bookbuildingFacade.updatePatientSerById(parentId, patient); - }else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == serType) { + } else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == serType) { PatientServiceQuery query = new PatientServiceQuery(); query.setParentid(parentId); query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); @@ -459,7 +457,7 @@ public class PatientServiceFacade { PatientService pser = new PatientService(); - if (StringUtils.isNotEmpty(ps.getCreateUser())){ + if (StringUtils.isNotEmpty(ps.getCreateUser())) { pser.setCreateUser(ps.getCreateUser()); } @@ -495,9 +493,9 @@ public class PatientServiceFacade { pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); //服务类型 pser.setSerType(Integer.parseInt(serInfo.get("serType"))); - if("2100002419".equals(hospitalId)){ + if ("2100002419".equals(hospitalId)) { pser.setSerDoct(userId.toString()); - }else{ + } else { if (serInfo.containsKey("serDoct")) { pser.setSerDoct(serInfo.get("serDoct")); } @@ -513,7 +511,7 @@ public class PatientServiceFacade { //服务开通操作时间 pser.setUpdateDate(new Date()); //服务开通操作人 - if (userId!=null){ + if (userId != null) { pser.setUpdateUser(String.valueOf(userId)); } @@ -558,7 +556,7 @@ public class PatientServiceFacade { babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); } } - } else if (ps.getPerType() != null && ps.getPerType() == 1){//孕妇建档服务数据处理 + } else if (ps.getPerType() != null && ps.getPerType() == 1) {//孕妇建档服务数据处理 if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))) {//孕期精准指导同步到建档 System.out.println("333333333333333333333"); Patients patient = new Patients(); @@ -566,7 +564,7 @@ public class PatientServiceFacade { patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); - sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.YUNOBJ.getId(),1); + sendServiceMsg(patients, SmsServiceEnums.FWKT.getId(), "您好，请点击此处查看开通服务内容详情。", "大同市第一人民医院", ServiceObjEnums.YUNOBJ.getId(), 1); } else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { System.out.println("555555555555555555555555"); @@ -582,14 +580,14 @@ public class PatientServiceFacade { bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); } } - }else {//产妇建档服务数据处理 + } else {//产妇建档服务数据处理 if (PatientSerEnums.SerTypeEnums.chkf.getId() == Integer.parseInt(serInfo.get("serType"))) {//产后康复同步到建档 System.out.println("66666666666666666"); Patients patient = new Patients(); patient.setServiceType(ServiceTypeEnums.ADD_MAT_DELIVER_SERVICE.getId()); patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); - sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.CHANOBJ.getId(),1); + sendServiceMsg(patients, SmsServiceEnums.FWKT.getId(), "您好，请点击此处查看开通服务内容详情。", "大同市第一人民医院", ServiceObjEnums.CHANOBJ.getId(), 1); } } @@ -602,8 +600,9 @@ public class PatientServiceFacade { baseResponse.setErrormsg("成功"); return baseResponse; } - //大同医院服务推送\短信 - public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1,Integer objType,Integer type){ + + //大同医院服务推送\短信 + public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1, Integer objType, Integer type) { System.out.println("333333333333333333333"); if ("2100002419".equals(patient.getHospitalId())) { try { @@ -632,7 +631,7 @@ public class PatientServiceFacade { mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId()); messages.add(mr); - if (type!=null){ + if (type != null) { String title = "服务提醒短信"; String messageContent = "【大同市第一人民医院】" + "欢迎加入我院健康咨询服务：请微信-添加朋友-公众号-搜索“美生孕育”关注；点击开通成功提醒，手机号获取验证码成功登录宝贝孕程小程序。请确保登录成功并持续关注“美生孕育”公众号，正常接收产检提醒，享受个性化指导文章推送、孕期随访及营养指导等服务。"; MsgRequest request = new MsgRequest(); @@ -656,7 +655,7 @@ public class PatientServiceFacade { request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); request.setFirst(messageContent); request.setKeyword1(title); - request.setKeyword2(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),0))); + request.setKeyword2(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), 0))); messages.add(request); } @@ -808,7 +807,7 @@ public class PatientServiceFacade { PatientService before = patientServiceService.getPatientService(ps.getId()); //开通人为上一次的数据，因为系统端不能修改，但是小程序可以修改 - if (StringUtils.isNotEmpty(before.getCreateUser())){ + if (StringUtils.isNotEmpty(before.getCreateUser())) { ps.setCreateUser(before.getCreateUser()); } @@ -826,7 +825,7 @@ public class PatientServiceFacade { ps.setDoctorWeek(ps.getDoctorWeek() + (before.getDoctorWeek() != null ? before.getDoctorWeek() : 0)); } } - if (before.getPerType()!=2){ + if (before.getPerType() != 2) { //修改服务时增加孕周内容 cfl 20231019 Patients patients = patientsService.findOnePatientById(ps.getParentid()); setServiceRecordUpdate(ps, patients); @@ -904,7 +903,7 @@ public class PatientServiceFacade { patient.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); } } - }else { + } else { if (PatientSerEnums.SerTypeEnums.chkf.getId() == ps.getSerType().intValue()) {//产后康复同步到建档 patient.setServiceType(ServiceTypeEnums.ADD_MAT_DELIVER_SERVICE.getId()); @@ -917,7 +916,7 @@ public class PatientServiceFacade { } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId().intValue()) { patient.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); } - // bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); + // bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); } @@ -1533,5 +1532,243 @@ public class PatientServiceFacade { // } // } } + @Autowired + private CommunityConfigService communityConfigService; + @Autowired + private CouponMapper couponMapper; + + public BaseResponse queryStatistics(Integer userId, JdStatisticsQueryRequest statisticsQueryRequest) { + BaseListResponse baseResponse = new BaseListResponse(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + if (StringUtils.isEmpty(hospitalId)) { + baseResponse.setErrormsg("获取医院id为空").setErrorcode(ErrorCodeConstants.SUCCESS); + return baseResponse; + } + + PatientsQuery patientsQuery=new PatientsQuery(); + patientsQuery.setYn(1); + patientsQuery.setHospitalId(hospitalId); + patientsQuery.setNeed("1"); + patientsQuery.setPage(statisticsQueryRequest.getPage()); + patientsQuery.setLimit(statisticsQueryRequest.getLimit()); + if (StringUtils.isNotEmpty(statisticsQueryRequest.getDueDate())){ + String time=statisticsQueryRequest.getDueDate(); + patientsQuery.setDueDateStart(DateUtil.parseYMDHMS(time+" 00:00:00")); + patientsQuery.setDueDateEnd(DateUtil.parseYMDHMS(time+" 23:59:59")); + } + if (StringUtils.isNotEmpty(statisticsQueryRequest.getBookbuildingDoctor())){ + patientsQuery.setBookbuildingDoctor(statisticsQueryRequest.getBookbuildingDoctor()); + } + if (StringUtils.isNotEmpty(statisticsQueryRequest.getBookbuildingDate())){ + String time=statisticsQueryRequest.getDueDate(); + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMDHMS(time+" 00:00:00")); + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMDHMS(time+" 23:59:59")); + } + List data = new ArrayList<>(); + if (statisticsQueryRequest.getType()==0){ + if (StringUtils.isEmpty(statisticsQueryRequest.getBookbuildingDoctor())){ + patientsQuery.setNebookbuildingDoctor("1"); + } + List list = patientsService.aggregatbookbuildingDoctore(patientsQuery); + for (HashMap map : list) { + CjStatisticsResult cjStatisticsResult = new CjStatisticsResult(); + String dId = null; + Object id = map.get("_id"); + if (null != id) { + dId = id.toString(); + } else { + continue; + } + + cjStatisticsResult.setdId(dId); + cjStatisticsResult.setCount(map.get("count").toString()); + try { + if (null == dId) { + cjStatisticsResult.setdName("未知"); + } else { + Users users = usersService.getUsers(Integer.valueOf(dId)); + if (null != users) { + cjStatisticsResult.setdName(users.getName()); + }else { + continue; + } + } + } catch (Exception e) { + } + data.add(cjStatisticsResult); + } + Collections.sort(data, new CjStatisticsResult()); + baseResponse.setObject(data); + }else { + List patientsList = patientsService.queryPatient(patientsQuery); + List patientManagerQueryModelList = new ArrayList <>(); + if (CollectionUtils.isNotEmpty(patientsList)){ + if (CollectionUtils.isNotEmpty(patientsList)) { + for (Patients patients : patientsList) { + PatientManagerQueryModel patientManagerQueryModel = new PatientManagerQueryModel(); + BeanUtils.copy(patients, patientManagerQueryModel); + +// patientManagerQueryModel.setLevel(patients.getRiskLevelId()); +// String join = org.apache.commons.lang.StringUtils.join( patients.getRiskFactorId(), ","); +// patientManagerQueryModel.setRiskFactorId(join); + //高危因素 + List factor = patients.getRiskFactorId(); + + if (CollectionUtils.isNotEmpty(factor)) { + StringBuilder sb = new StringBuilder(56); + for (String srt : factor) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(srt)) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); + if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { + sb.append(basicConfig.getName()).append(','); + } + } + } + if (sb.toString().endsWith(",")) { + patientManagerQueryModel.setRiskFactorId(sb.substring(0, sb.length() - 1)); + } else { + patientManagerQueryModel.setRiskFactorId(sb.toString()); + } + + if (!"-".equals(patientManagerQueryModel.getRiskFactorId()) && org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) { + patientManagerQueryModel.setRiskFactorId(patientManagerQueryModel.getRiskFactorId()+","+patients.getoRiskFactor()); + }else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) + { + patientManagerQueryModel.setRiskFactorId(patients.getoRiskFactor()); + } + } + else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) + { + patientManagerQueryModel.setRiskFactorId(patients.getoRiskFactor()); + } + + List level = new ArrayList(); + if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getRiskLevelId())) { + try { + List list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); + for (String str : list) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); + if (null != basicConfig) { + Map map = new HashMap(); + basicConfig.replenRisk(map); + level.add(map); + } + } + } catch (Exception e) { + ExceptionUtils.catchException(e, "patients.getRiskLevelId error."); + } + patientManagerQueryModel.setLevel(HighScoreResult.filter(level)); + } + + Organization org = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); + if(null != org){ + patientManagerQueryModel.setOrgType(org.getType()); + } + + String comm = "未分配"; + if(StringUtils.isNotEmpty(patients.getCommunityId())){ + CommunityConfig communityConfig = communityConfigService.getCommunityById(patients.getCommunityId()); + if(null != communityConfig){ + comm = communityConfig.getName(); + } + } + patientManagerQueryModel.setCouponCommunity(comm); + patientManagerQueryModel.setTypeStr(patients.getType() == 1 ? "未分娩" : "已分娩"); + patientManagerQueryModel.setYyzyfmHospitalName( + (patients.getYyzyfmHospitalId() != null && "-1".equals(patients.getYyzyfmHospitalId())) ? "其他" : couponMapper.getHospitalName(patients.getYyzyfmHospitalId())); + patientManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth())); + patientManagerQueryModel.setpId(patients.getPid()); + String dueWeek = ""; + try { + if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { +// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { + dueWeek = "已分娩"; + } else { + int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); + if (days > 7 * 42 - 1) { + dueWeek = "已分娩"; + } else { + String week = (days / 7) + ""; + int day = (days % 7); + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + } + } + } catch (Exception e) { + // 什么都不干 + } + if ("1000000114".equals(patients.getHospitalId())) { + patientManagerQueryModel.setPhone(patients.getPhone()); + patientManagerQueryModel.setCardNo(patients.getCardNo()); + } else { + patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); + patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); + } + patientManagerQueryModel.setBuildWeek(dueWeek); + + String bookbuildingDoctor = ""; + if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { + Users user = usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor())); + if (user != null) { + bookbuildingDoctor = user.getName(); + } else { + System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor()); + } + } + //初诊时间和初诊医生字段展示,作为模块化 + if (StringUtils.isNotEmpty(patients.getFirstCheckId())) { + Users users = usersService.getUsers(Integer.parseInt(patients.getFirstCheckId())); + if (users != null) { + patientManagerQueryModel.setProdDoctor(users.getName()); + } + patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime())); + } + //滦平,围场,需求。初诊时间和初诊医生字段展示。 +// if ("2100001377".equals(hospitalId)||"2100001452".equals(hospitalId)) { +// //初诊 +// AntExChuQuery antExChuQuery = new AntExChuQuery(); +// antExChuQuery.setYn(YnEnums.YES.getId()); +// antExChuQuery.setHospitalId(hospitalId); +// antExChuQuery.setParentId(patients.getId()); +// List antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery()); +// if (CollectionUtils.isNotEmpty(antExChuModelList)) { +// AntExChuModel antExChuModel = antExChuModelList.get(0); +// if (StringUtils.isNotEmpty(antExChuModel.getProdDoctor())) { +// Users users = usersService.getUsers(Integer.parseInt(antExChuModel.getProdDoctor())); +// if (users != null) { +// patientManagerQueryModel.setProdDoctor(users.getName()); +// } +// } +// patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); +// } +// } + patientManagerQueryModel.setBooksuifangDoctor(patients.getBooksuifangDoctor()); + patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor); + patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); + patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); + patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + patientManagerQueryModel.setId(patients.getId()); + patientManagerQueryModel.setLowerHairOgrId(StringUtils.isNotEmpty(patients.getLowerHairOgrId()) ? organizationService.getOrganizationName(patients.getLowerHairOgrId()) : ""); + if (patients.getSendCareMan() != null) { + if ("0".equals(patients.getSendCareMan())) { + patientManagerQueryModel.setSendCareMan("未发放"); + } else if ("1".equals(patients.getSendCareMan())) { + patientManagerQueryModel.setSendCareMan("首发"); + } else if ("2".equals(patients.getSendCareMan())) { + patientManagerQueryModel.setSendCareMan("补发"); + } + } + + //滦平20211227 + patientManagerQueryModel.setNextCheckTime(DateUtil.getyyyy_MM_dd(patients.getNextCheckTime())); + patientManagerQueryModelList.add(patientManagerQueryModel); + + } + } + } + baseResponse.setData(patientManagerQueryModelList).setPageInfo(patientsQuery.getPageInfo()); + } + + return baseResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index b579f73..4fe4c20 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -136,6 +136,8 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { private String sieveType; private String teamId; + // 大同高危专号查询 + private String highRiskFileCode; public String getVillageRegisterId() { return villageRegisterId; @@ -556,4 +558,12 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { public void setCzhospitalId(String czhospitalId) { this.czhospitalId = czhospitalId; } + + public String getHighRiskFileCode() { + return highRiskFileCode; + } + + public void setHighRiskFileCode(String highRiskFileCode) { + this.highRiskFileCode = highRiskFileCode; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 7d8dde2..89575c8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -154,6 +154,17 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { //胎次 private Integer dueCount; + //大同 高危专号 + private String highRiskFileCode; + + public String getHighRiskFileCode() { + return highRiskFileCode; + } + + public void setHighRiskFileCode(String highRiskFileCode) { + this.highRiskFileCode = highRiskFileCode; + } + public Integer getDueCount() { return dueCount; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/JdStatisticsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/JdStatisticsQueryRequest.java new file mode 100644 index 0000000..70b43e9 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/JdStatisticsQueryRequest.java @@ -0,0 +1,49 @@ +package com.lyms.platform.operate.web.request; + +import java.util.Date; + +/** + * 建档统计管理 + */ +public class JdStatisticsQueryRequest extends BasePageQueryRequest { + //0 统计 1 类别 + private int type=0; + //建档医生 + private String bookbuildingDoctor; + //建档日期 + private String bookbuildingDate; + //预产期 + private String dueDate; + + public String getBookbuildingDoctor() { + return bookbuildingDoctor; + } + + public void setBookbuildingDoctor(String bookbuildingDoctor) { + this.bookbuildingDoctor = bookbuildingDoctor; + } + + public String getBookbuildingDate() { + return bookbuildingDate; + } + + public void setBookbuildingDate(String bookbuildingDate) { + this.bookbuildingDate = bookbuildingDate; + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index 66f62bf..bda0178 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -54,6 +54,8 @@ public class PatientManagerRequest extends BasePageQueryRequest { //乐陵是妇幼母子保健手册下发机构 private String lowerHairOgrId; + // 大同高危专号查询 + private String highRiskFileCode; public Integer getType() { @@ -356,4 +358,11 @@ public class PatientManagerRequest extends BasePageQueryRequest { this.operatorId = operatorId; } + public String getHighRiskFileCode() { + return highRiskFileCode; + } + + public void setHighRiskFileCode(String highRiskFileCode) { + this.highRiskFileCode = highRiskFileCode; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 7515034..38a67de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -193,8 +193,17 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //体重异常管理-接收建档时间筛选用 private String buildDate; + //大同 高危专号 + private String highRiskFileCode; + public String getHighRiskFileCode() { + return highRiskFileCode; + } + + public void setHighRiskFileCode(String highRiskFileCode) { + this.highRiskFileCode = highRiskFileCode; + } public String getVillageRegisterId() { return villageRegisterId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index fe99e88..50b60ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -477,8 +477,12 @@ public class YunBookbuildingAddRequest { //备注 private String mremark; - //高危专案档案号 + //高危专案档案号 大同 private String highRiskFileCode; + //产检医生 大同 + private String lastCheckEmployeeId; + //产检医生 + private String lastCheckEmployeeName; //就诊卡号 @FormParam @@ -622,6 +626,14 @@ public class YunBookbuildingAddRequest { //是否建册 private String buildingManualCode; + public String getLastCheckEmployeeName() { + return lastCheckEmployeeName; + } + + public void setLastCheckEmployeeName(String lastCheckEmployeeName) { + this.lastCheckEmployeeName = lastCheckEmployeeName; + } + public Integer getIsAppCreate() { return isAppCreate; } @@ -1497,6 +1509,14 @@ public class YunBookbuildingAddRequest { this.highRiskFileCode = highRiskFileCode; } + public String getLastCheckEmployeeId() { + return lastCheckEmployeeId; + } + + public void setLastCheckEmployeeId(String lastCheckEmployeeId) { + this.lastCheckEmployeeId = lastCheckEmployeeId; + } + @Override public String toString() { return "YunBookbuildingAddRequest{" + 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 d0629b9..2c7ecfa 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 @@ -51,7 +51,26 @@ public class PregnantInfoResult { */ //空或者1为正常 2为补录 private String normal; + //高危专案档案号 大同 + private String highRiskFileCode; + //最后一次产检医生职工ID + private String lastCheckEmployeeId; + public String getLastCheckEmployeeId() { + return lastCheckEmployeeId; + } + + public void setLastCheckEmployeeId(String lastCheckEmployeeId) { + this.lastCheckEmployeeId = lastCheckEmployeeId; + } + + public String getHighRiskFileCode() { + return highRiskFileCode; + } + + public void setHighRiskFileCode(String highRiskFileCode) { + this.highRiskFileCode = highRiskFileCode; + } public String getIsYyzyfmHospital() { return isYyzyfmHospital;