diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java new file mode 100644 index 0000000..feba717 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java @@ -0,0 +1,123 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.BookbuildingFacade; +import com.lyms.platform.operate.web.result.FrontEndResult; +import com.lyms.platform.permission.model.FactorProject; +import com.lyms.platform.permission.model.FactorProjectEntity; +import com.lyms.platform.permission.model.FactorProjectManage; +import com.lyms.platform.permission.model.FactorProjectQuery; +import com.lyms.platform.permission.service.FactorProjectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Date; +import java.util.List; + +@Controller +@RequestMapping("/factorProject") +public class FactorProjectController extends BaseController { + @Autowired + @Qualifier("factorProjectService") + private FactorProjectService factorProjectService; + + @RequestMapping(value = "/getList", method = RequestMethod.GET) + @ResponseBody + public FrontEndResult getCheckItemManageList(@RequestParam(value = "hospitalId") Integer hospitalId, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "week", required = false) String week, + @RequestParam(value = "limit", required = false) Integer limit) { + FactorProjectQuery factorProjectQuery = new FactorProjectQuery(); + factorProjectQuery.setNeed("true"); + factorProjectQuery.setSort("id asc"); + factorProjectQuery.setPage(page); + factorProjectQuery.setLimit(limit); + factorProjectQuery.setHospitalId(hospitalId); + factorProjectQuery.setWeek(week); + + List list = factorProjectService.getList(factorProjectQuery); + + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setPageInfo(factorProjectQuery.getPageInfo()); + frontEndResult.setData(list); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); + return frontEndResult; + } + + @RequestMapping(value = "/add", method = RequestMethod.POST) + @TokenRequired + public void add(HttpServletResponse response, @RequestBody FactorProject factorProject) { + if (factorProject.getHospitalId() == null) { + ResultUtils.buildParameterErrorResultAndWrite(response, "医院ID不能为空"); + } + factorProject.setCreated(new Date()); + factorProjectService.add(factorProject); + ResultUtils.buildSuccessResultAndWrite(response); + } + + @RequestMapping(value = "/update", method = RequestMethod.POST) + //@TokenRequired + public void update(HttpServletResponse response, @RequestBody FactorProject factorProject) { + if (factorProject.getId() == null) { + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); + } + factorProjectService.update(factorProject); + ResultUtils.buildSuccessResultAndWrite(response); + } + + @RequestMapping(value = "/del", method = RequestMethod.GET) + @TokenRequired + public void del(HttpServletResponse response, @RequestParam(value = "id") Integer id) { + if (id == null) { + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); + } + FactorProject factorProject= factorProjectService.selectById(id); + if (factorProject!=null){ + factorProjectService.del(id); + } + ResultUtils.buildSuccessResultAndWrite(response); + } + + @Autowired + private BookbuildingFacade bookbuildingFacade; + + @RequestMapping(value = "/selectInfo", method = RequestMethod.GET) + @TokenRequired + public void selectInfo(HttpServletResponse response, @RequestParam(value = "id") Integer id) { + if (id == null) { + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); + } + FactorProjectManage factorProject= factorProjectService.selectInfo(id); + + ResultUtils.buildSuccessResultAndWrite(response,factorProject); + } + + @RequestMapping(value = "/selectByWeek", method = RequestMethod.GET) + //@TokenRequired + public void selectInfo(HttpServletResponse response, + @RequestParam(value = "hospitalId") Integer hospitalId, + @RequestParam(value = "week") String week) { + if (hospitalId == null) { + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); + } + FactorProjectQuery factorProjectQuery=new FactorProjectQuery(); + factorProjectQuery.setHospitalId(hospitalId); + factorProjectQuery.setWeek(week); + FactorProjectEntity factorProject= factorProjectService.selectByWeek(factorProjectQuery); + ResultUtils.buildSuccessResultAndWrite(response,factorProject); + } + + + @RequestMapping(value = "/test", method = RequestMethod.GET) + public void test(HttpServletResponse response){ + bookbuildingFacade.bookbuildingSync(); + ResultUtils.buildSuccessResultAndWrite(response); + } +} 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 b612123..81259e6 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 @@ -24,6 +24,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.service.IBaseService; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.JdbcUtil; @@ -32,11 +33,13 @@ import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.dao.master.MasterOrganizationMapper; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.CouponService; +import com.lyms.platform.permission.service.FactorProjectService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -208,6 +211,8 @@ public class BookbuildingFacade { private AuthenticationFacade authenticationFacade; @Autowired private CommunityConfigService communityConfigService; + @Autowired + private FactorProjectService factorProjectService; public static final String syncToV2Url = PropertiesUtils.getPropertyValue("sync_to_v2_url"); @@ -231,24 +236,21 @@ public class BookbuildingFacade { * @return */ public BaseObjectResponse addPregnantBookbuilding( - YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) { + YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) { // if (yunRequest.getBooksuifangDoctor()!=null){ // yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctor())); // } - if (StringUtils.isNotEmpty(yunRequest.getOrgName())) - { + if (StringUtils.isNotEmpty(yunRequest.getOrgName())) { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setName(yunRequest.getOrgName()); List organizations = organizationService.queryOrganization(organizationQuery); - if (CollectionUtils.isNotEmpty(organizations)) - { + if (CollectionUtils.isNotEmpty(organizations)) { yunRequest.setHospitalId(String.valueOf(organizations.get(0).getId())); UsersQuery usersQuery = new UsersQuery(); usersQuery.setOrgId(organizations.get(0).getId()); List users = usersService.queryUsers(usersQuery); - if (CollectionUtils.isNotEmpty(users)) - { + if (CollectionUtils.isNotEmpty(users)) { uId = users.get(0).getId(); } } @@ -386,7 +388,7 @@ public class BookbuildingFacade { getTrackHospital(patient); String riskFactorId = yunRequest.getRiskFactorId(); - if(org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)){ + if (org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)) { patient.setRiskFactorId(Arrays.asList(riskFactorId.split(","))); } patient.setRiskLevelId(yunRequest.getLevel()); @@ -407,7 +409,7 @@ public class BookbuildingFacade { operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), null, OptActionEnums.ADD.getId(), "孕妇建档"); /** 建档核验模块 **/ //建档成功后保存核验结果 - if(StringUtils.isNotEmpty(p.getId()) && null != yunRequest.getVerifyInfo()){ + if (StringUtils.isNotEmpty(p.getId()) && null != yunRequest.getVerifyInfo()) { yunRequest.getVerifyInfo().setPid(p.getId()); yunRequest.getVerifyInfo().setVerifyDate(p.getBookbuildingDate()); authenticationFacade.addOrUpDate(yunRequest.getVerifyInfo(), userId); @@ -434,7 +436,6 @@ public class BookbuildingFacade { } - //加入产筛 patientsService.validata(p); @@ -520,6 +521,7 @@ public class BookbuildingFacade { if (tempP.getType() == ServiceObjEnums.YUNOBJ.getId()) { //生成建档短信 createBuildMsg(tempP); + } //秦皇岛建档获取分娩信息 if ("4".equals(HIS_VERSION) && "216".equals(tempP.getHospitalId())) { @@ -550,7 +552,7 @@ public class BookbuildingFacade { } } //自动诊断 - antenatalExaminationFacade.autoPatientRisk(tempP,userId); + antenatalExaminationFacade.autoPatientRisk(tempP, userId); } }); @@ -569,30 +571,23 @@ public class BookbuildingFacade { return br; } - private void getTrackHospital(Patients patients) - { - if (CollectionUtils.isNotEmpty(patients.getChildExtAddrs())) - { + private void getTrackHospital(Patients patients) { + if (CollectionUtils.isNotEmpty(patients.getChildExtAddrs())) { PostVisitHospitalModelQuery postQuery = new PostVisitHospitalModelQuery(); postQuery.setAreaTiters(patients.getChildExtAddrs()); List postVisitHospitalModels = postVisitHospitalService.queryPostVisitHospitalModel(postQuery); - if (CollectionUtils.isNotEmpty(postVisitHospitalModels)) - { - System.out.println("setTrackHospitalId==="+postVisitHospitalModels.get(0).getPostHosptial()); + if (CollectionUtils.isNotEmpty(postVisitHospitalModels)) { + System.out.println("setTrackHospitalId===" + postVisitHospitalModels.get(0).getPostHosptial()); patients.setTrackHospitalId(postVisitHospitalModels.get(0).getPostHosptial()); } } } - private void getNumberCode(Patients patients) - { - if (patients.getCardNo().length() > 8) - { + private void getNumberCode(Patients patients) { + if (patients.getCardNo().length() > 8) { patients.setNumberCode(patients.getCardNo().substring(patients.getCardNo().length() - 8)); - } - else - { + } else { patients.setNumberCode(patients.getCardNo()); } } @@ -1114,16 +1109,13 @@ public class BookbuildingFacade { mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); mr.setPhone(patient.getPhone()); - if (templateModel.getSendTime() != null && "00:00".equals(templateModel.getSendTime())) - { + if (templateModel.getSendTime() != null && "00:00".equals(templateModel.getSendTime())) { mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - } - else - { + } else { mr.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId()); - String date = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),templateModel.getSendTimeType())); - mr.setPlanTime(date + " " + templateModel.getSendTime() +":00"); + String date = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), templateModel.getSendTimeType())); + mr.setPlanTime(date + " " + templateModel.getSendTime() + ":00"); } @@ -1152,6 +1144,146 @@ public class BookbuildingFacade { } } } + //发送产检录入 秦皇岛二院 + sendbuildingMsg(patient, SmsServiceEnums.FWKT.getId(), "【产检录入提醒】", "亲爱的孕妈妈，请点击小程序录入产检信息", ""); + + } + + private void sendbuildingMsg(Patients patient, Integer subTypeId, String first, String keyWord1, String remark) { + if ("1000000016".equals(patient.getHospitalId())) { + List messages = new ArrayList<>(); + MsgRequest mr = new MsgRequest(); + mr.setPhone(patient.getPhone()); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); + mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setHospitalId(patient.getHospitalId()); + mr.setTempId("657ad0e90cf25d442e62df56"); + mr.setPatientId(patient.getId()); + mr.setSmsStatus(SmsStatusEnums.WFS.getId()); + mr.setServiceType(1); //判断发送类型 + mr.setFirst(first);// + mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); + mr.setSubTypeId(subTypeId); + mr.setKeyword1(keyWord1);// + String keyWord2 = DateUtil.getyyyy_MM_dd(DateUtil.addDay(DateUtil.getYMDTime(), 1)); + if (subTypeId != 7) { + keyWord2 = DateUtil.getyyyy_MM_dd(new Date()); + } + mr.setKeyword2(keyWord2); + mr.setRemark(remark); + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setWxTempId(WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId()); + messages.add(mr); + smsConfigFacade.saveMsg(messages, patient.getHospitalId()); + } + } + + /** + * 秦皇岛二院 产检录入提醒 下午17点推送 + * + * @param + */ + public void bookbuildingSync() { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setHospitalId("1000000016"); + patientsQuery.setExtEnable(false); + patientsQuery.setBuildTypeNot(1); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setIsNextCheckTime(DateUtil.getYMDTime()); + // patientsQuery.setIsNextCheckTime(DateUtil.addDay(DateUtil.getYMDTime(), 0)); + final List patientList = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientList)) { + new Thread(new Runnable() { + @Override + public void run() { + for (int i = 0, j = patientList.size(); i < j; i++) { + Patients patients = patientList.get(i); + sendbuildingMsg(patients, SmsServiceEnums.FWKT.getId(), "【产检录入提醒】", "亲爱的孕妈妈，请点击小程序录入产检信息", ""); + } + } + }).start(); + } + } + + /** + * 秦皇岛二院产检提醒 上午9点推送 + */ + public void weekSync() { + logger.info("weekSync startup"); + final String hospitalId = "1000000016"; + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setHospitalId(hospitalId); + patientsQuery.setExtEnable(false); + patientsQuery.setBuildTypeNot(1); + patientsQuery.setYn(YnEnums.YES.getId()); + + Date time = DateUtil.addDay(DateUtil.getYMDTime(), 1); + String str = DateUtil.getyyyy_MM_dd(time); + patientsQuery.setIsNextCheckTime(DateUtil.parseYMD(str)); + final List patientList = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientList)) { + logger.info("weekSync Threading"); + new Thread(new Runnable() { + @Override + public void run() { + for (int i = 0, j = patientList.size(); i < j; i++) { + Patients patients = patientList.get(i); + String week = getBuildingWeek(patients); + sendbuildingMsg(patients, SmsServiceEnums.CJYYTX.getId(), "【产检提醒】", "亲爱的孕妈妈，您当前孕周为" + week + ",请点击此处查看就诊流程。", week); + + if (CollectionUtils.isNotEmpty(patients.getRiskFactorId()) && !patients.getRiskFactorId().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { + //TODO 处理高危和健康跳转的页面逻辑 push_center + try { + FactorProjectQuery factorProjectQuery = new FactorProjectQuery(); + factorProjectQuery.setHospitalId(Integer.valueOf(hospitalId)); + factorProjectQuery.setWeek(week); + factorProjectQuery.setRiskFactorIds(patients.getRiskFactorId()); + List projectList = factorProjectService.getList(factorProjectQuery); + if (CollectionUtils.isNotEmpty(projectList)) { + logger.info("FactorProject is not null"); + Thread.sleep(3000); + sendbuildingMsg(patients, SmsServiceEnums.CJYYTX.getId(), "【产检提醒】", "您当前有高危因素，请点击查看具体产检流程", week); + + } + } catch (InterruptedException e) { + logger.error("weekSync InterruptedException," + e.getMessage()); + } + } + } + } + }).start(); + } + logger.info("weekSync end"); + } + + + /** + * 查询孕期 + * + * @param patients + * @return + */ + private String getBuildingWeek(Patients patients) { + 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) { + // 什么都不干 + } + return dueWeek; } /** @@ -1289,7 +1421,7 @@ public class BookbuildingFacade { /** 建档核验模块 **/ //建档修改成功后添加或修改核验结果 - if(null != yunRequest.getVerifyInfo() && StringUtils.isNotEmpty(id)){ + if (null != yunRequest.getVerifyInfo() && StringUtils.isNotEmpty(id)) { authenticationFacade.addOrUpDate(yunRequest.getVerifyInfo(), userId); } /**------------**/ @@ -1341,16 +1473,16 @@ public class BookbuildingFacade { * @Author: 武涛涛 * @Date: 2020/11/25 14:04 */ - private void puerperaConvertPregnant (String id, YunBookbuildingAddRequest yunRequest, Patients patient, Patients beforePatient){ + private void puerperaConvertPregnant(String id, YunBookbuildingAddRequest yunRequest, Patients patient, Patients beforePatient) { try { Date lastMenses = patient.getLastMenses(); - Date endDate = DateUtil.addDay(new Date(), -294); + Date endDate = DateUtil.addDay(new Date(), -294); int i = lastMenses.compareTo(endDate); //判断为自动分娩产妇（buildType 2 自动分娩类型）,手动分娩的不做处理 - if(beforePatient!=null && beforePatient.getBuildType()==2 && beforePatient.getIsAutoFm()==1){ + if (beforePatient != null && beforePatient.getBuildType() == 2 && beforePatient.getIsAutoFm() == 1) { // 修改末次月经时在孕期就修改为孕妇状态 - if(i == 1){ + if (i == 1) { patient.setType(1); patient.setBuildType(0); patient.setModified(new Date()); @@ -1367,7 +1499,7 @@ public class BookbuildingFacade { pmodel.setType(1); personService.updatePerson(pmodel, yunRequest.getPid()); } - }else if((i == -1 || i == 0) && beforePatient.getFmDate()!=null){//自动分娩改成孕妇后，有修改末次月经成满足分娩在自动分娩 + } else if ((i == -1 || i == 0) && beforePatient.getFmDate() != null) {//自动分娩改成孕妇后，有修改末次月经成满足分娩在自动分娩 patientsService.setAutoMatDeliver(patient.getCardNo(), null); } } catch (Exception e) { @@ -1380,48 +1512,42 @@ public class BookbuildingFacade { /** * 更新当前产程所有的档案的信息 */ - private void updateCurrentAllPatientInfo(Patients patient) - { + private void updateCurrentAllPatientInfo(Patients patient) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setPid(patient.getPid()); patientsQuery.setLastMensesStart(patient.getLastMenses()); List localPatients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(localPatients)) - { - for (Patients pat : localPatients) - { - if (!pat.getId().equals(patient.getId())) - { - getPatientsData(pat,patient); + if (CollectionUtils.isNotEmpty(localPatients)) { + for (Patients pat : localPatients) { + if (!pat.getId().equals(patient.getId())) { + getPatientsData(pat, patient); yunBookbuildingService.updatePregnant(pat, pat.getId()); } } } - if (patient != null) - { + if (patient != null) { //更新分娩记录中的产后修供养地址 MatDeliverQuery deliverQuery = new MatDeliverQuery(); deliverQuery.setYn(YnEnums.YES.getId()); deliverQuery.setPid(patient.getPid()); List maternalDeliverModels = matDeliverService.query(deliverQuery); - if (CollectionUtils.isNotEmpty(maternalDeliverModels)) - { + if (CollectionUtils.isNotEmpty(maternalDeliverModels)) { MaternalDeliverModel model = maternalDeliverModels.get(0); model.setProvincePostRestId(patient.getProvincePostRestId()); model.setCityPostRestId(patient.getCityPostRestId()); model.setAreaPostRestId(patient.getStreetPostRestId()); model.setStreetPostRestId(patient.getProvincePostRestId()); model.setAddressPostRest(patient.getAddressPostRest()); - matDeliverService.updateOne(model,model.getId()); + matDeliverService.updateOne(model, model.getId()); } } } - public void getPatientsData(Patients patient,Patients updatePatient) { + public void getPatientsData(Patients patient, Patients updatePatient) { patient.setChildExtAddrs(updatePatient.getChildExtAddrs()); patient.setReqHusband(updatePatient.getReqHusband()); patient.setFuckLastMens(updatePatient.getFuckLastMens()); @@ -1568,8 +1694,7 @@ public class BookbuildingFacade { //衡水区域并且不是衡水市第六人民医院 - if("12".equals(org.getCityId()) && !"2100002324".equals(hospitalId)) - { + if ("12".equals(org.getCityId()) && !"2100002324".equals(hospitalId)) { hids.remove("2100002324");//衡水六院登陆 } @@ -1692,9 +1817,9 @@ public class BookbuildingFacade { } String comm = "未分配"; - if(StringUtils.isNotEmpty(pat.getCommunityId())){ + if (StringUtils.isNotEmpty(pat.getCommunityId())) { CommunityConfig communityConfig = communityConfigService.getCommunityById(pat.getCommunityId()); - if(null != communityConfig){ + if (null != communityConfig) { comm = communityConfig.getName(); } } @@ -1738,9 +1863,9 @@ public class BookbuildingFacade { // 居住类型 List liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID); //秦皇岛需求-增加有居住证，客服配置（其他地区不需要这个选项,前端公共页面调用这个接口这里需处理） - if(StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)){ + if (StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)) { for (BasicConfigResult basicConfigResult : liveType) { - if("有居住证".equals(basicConfigResult.getName())){ + if ("有居住证".equals(basicConfigResult.getName())) { liveType.remove(basicConfigResult); break; } @@ -1801,18 +1926,18 @@ public class BookbuildingFacade { patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); } - List> list = new ArrayList(); + List> list = new ArrayList(); Map map = new HashMap<>(); if (CollectionUtils.isNotEmpty(patients)) { Patients patients1 = patients.get(0); //孕妇基本信息 - map.put("username",patients1.getUsername() );//姓名 + map.put("username", patients1.getUsername());//姓名 map.put("cardNo", patients1.getCardNo());//证件号 - map.put("pcountryId",getBasicConfig(patients1.getPcountryId()));//孕妇国籍 + map.put("pcountryId", getBasicConfig(patients1.getPcountryId()));//孕妇国籍 map.put("pnationId", getBasicConfig(patients1.getPnationId()));//孕妇民族 - map.put("pcensusTypeId",getBasicConfig(patients1.getPcensusTypeId()));//户籍类型 - map.put("pprofessionTypeId",getBasicConfig(patients1.getPprofessionTypeId()));//职业类别 + map.put("pcensusTypeId", getBasicConfig(patients1.getPcensusTypeId()));//户籍类型 + map.put("pprofessionTypeId", getBasicConfig(patients1.getPprofessionTypeId()));//职业类别 //孕妇联系方式 map.put("phone", patients1.getPhone());//联系方式 @@ -1829,44 +1954,44 @@ public class BookbuildingFacade { map.put("register", register);//孕妇居户籍地址 String postRest = CommonsHelper.getResidence(patients1.getProvincePostRestId(), patients1.getCityPostRestId(), patients1.getAreaPostRestId(), patients1.getStreetPostRestId(), patients1.getAddressPostRest(), basicConfigService); - map.put("postRest",postRest );// 产后休养地 + map.put("postRest", postRest);// 产后休养地 //丈夫信息 map.put("husbandName", patients1.getHusbandName());//丈夫姓名 map.put("hcertificateNum", patients1.getHcertificateNum());//丈夫证件号码 - map.put("hcountryId",getBasicConfig(patients1.getHcountryId()));//国籍 + map.put("hcountryId", getBasicConfig(patients1.getHcountryId()));//国籍 map.put("hnationId", getBasicConfig(patients1.getHnationId()));//民族 map.put("husbandPhone", patients1.getHusbandPhone());//丈夫联系方式 - map.put("hprofessionTypeId",getBasicConfig(patients1.getHprofessionTypeId()) );//职业类别 - map.put("hworkUnit",patients1.getHworkUnit());//工作单位 + map.put("hprofessionTypeId", getBasicConfig(patients1.getHprofessionTypeId()));//职业类别 + map.put("hworkUnit", patients1.getHworkUnit());//工作单位 //map.put("", );//请输入丈夫工作单位 String husbandRegister = CommonsHelper.getResidence(patients1.getHprovinceRegisterId(), patients1.getHcityRegisterId(), patients1.getHareaRegisterId(), patients1.getHstreetRegisterId(), patients1.getHaddressRegister(), basicConfigService); - map.put("husbandRegister",husbandRegister ); //丈夫户籍地址 + map.put("husbandRegister", husbandRegister); //丈夫户籍地址 // 院内信息 map.put("lastMenses", DateUtil.getyyyy_MM_dd(patients1.getLastMenses()));//末次月经 - map.put("mensStopStartDay",patients1.getMensStopStartDay());//月经停留开始天数 - map.put("mensStopEndDay",patients1.getMensStopEndDay());//月经停留结束天数 - map.put("mensStartDay",patients1.getMensStopEndDay());//月经周期开始天数 - map.put("mensEndDay",patients1.getMensStopEndDay());//月经周期结束天数 - map.put("lastMenstrualPeriodBasisDate",DateUtil.getyyyy_MM_dd(patients1.getLastMenses()));//末次月经纠正时间 - map.put("dueDate",DateUtil.getyyyy_MM_dd(patients1.getDueDate()));//预产期 - map.put("fileCode",patients1.getFileCode());//档案编号 - map.put("vcCardNo",patients1.getVcCardNo());//就诊卡号 - map.put("mremark",patients1.getMremark());//备注 - map.put("bookbuildingDoctor",couponMapper.findUserName(patients1.getBookbuildingDoctor()));//建档医生 - map.put("bookbuildingDate",DateUtil.getyyyy_MM_dd(patients1.getBookbuildingDate()));//建档日期 + map.put("mensStopStartDay", patients1.getMensStopStartDay());//月经停留开始天数 + map.put("mensStopEndDay", patients1.getMensStopEndDay());//月经停留结束天数 + map.put("mensStartDay", patients1.getMensStopEndDay());//月经周期开始天数 + map.put("mensEndDay", patients1.getMensStopEndDay());//月经周期结束天数 + map.put("lastMenstrualPeriodBasisDate", DateUtil.getyyyy_MM_dd(patients1.getLastMenses()));//末次月经纠正时间 + map.put("dueDate", DateUtil.getyyyy_MM_dd(patients1.getDueDate()));//预产期 + map.put("fileCode", patients1.getFileCode());//档案编号 + map.put("vcCardNo", patients1.getVcCardNo());//就诊卡号 + map.put("mremark", patients1.getMremark());//备注 + map.put("bookbuildingDoctor", couponMapper.findUserName(patients1.getBookbuildingDoctor()));//建档医生 + map.put("bookbuildingDate", DateUtil.getyyyy_MM_dd(patients1.getBookbuildingDate()));//建档日期 OrganizationQuery query = new OrganizationQuery(); query.setId(Integer.parseInt(patients1.getTownOrgId())); query.setYn(YnEnums.YES.getId()); List organizationList = masterOrganizationMapper.queryOrganization(query); String name = ""; - if(CollectionUtils.isNotEmpty(organizationList)){ + if (CollectionUtils.isNotEmpty(organizationList)) { name = organizationList.get(0).getName(); } - map.put("townOrgId",name);//乡镇卫生机构 + map.put("townOrgId", name);//乡镇卫生机构 list.add(map); } @@ -1936,8 +2061,8 @@ public class BookbuildingFacade { patient.setAddressRegister(yunRequest.getPregnantCensusAddr()); //增加村villageRegister字段这里为了全局展示拼接到Address详细字段中 - if(StringUtils.isNotEmpty(yunRequest.getVillageRegister())){ - patient.setAddressRegister(yunRequest.getVillageRegister()+yunRequest.getPregnantCensusAddr()); + if (StringUtils.isNotEmpty(yunRequest.getVillageRegister())) { + patient.setAddressRegister(yunRequest.getVillageRegister() + yunRequest.getPregnantCensusAddr()); } //增加村字段，出生证明需要用必填 patient.setVillageRegister(yunRequest.getVillageRegister()); @@ -1962,8 +2087,7 @@ public class BookbuildingFacade { patient.setStreetPostRestId(yunRequest.getChildbirthStreetId()); - if(yunRequest.getReqHusband() != null && yunRequest.getReqHusband()) - { + if (yunRequest.getReqHusband() != null && yunRequest.getReqHusband()) { //丈夫信息 patient.setHusbandName(""); patient.setHcertificateTypeId(""); @@ -1992,16 +2116,13 @@ public class BookbuildingFacade { patient.setRiskLevelId(yunRequest.getLevel()); String riskFactorId = yunRequest.getRiskFactorId(); - if(org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)){ + if (org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)) { patient.setRiskFactorId(Arrays.asList(riskFactorId.split(","))); } - if (StringUtils.isNotEmpty(yunRequest.getId())) - { - patientsService.updatePatientHusbandBirth(yunRequest.getId(),null); + if (StringUtils.isNotEmpty(yunRequest.getId())) { + patientsService.updatePatientHusbandBirth(yunRequest.getId(), null); } - } - else - { + } else { //丈夫信息 patient.setHusbandName(yunRequest.getHusbandName()); patient.setHcertificateTypeId(yunRequest.getHusbandCertificateTypeId()); @@ -2043,8 +2164,8 @@ public class BookbuildingFacade { patient.setHstreetId(yunRequest.getHstreetId()); patient.setHaddress(yunRequest.getHaddress()); //增加村字段这里为了全局展示拼接到Address详细字段中 - if(StringUtils.isNotEmpty(yunRequest.getHvillage())){ - patient.setHaddress(yunRequest.getHvillage()+yunRequest.getHaddress()); + if (StringUtils.isNotEmpty(yunRequest.getHvillage())) { + patient.setHaddress(yunRequest.getHvillage() + yunRequest.getHaddress()); } //村字段，出生证明需要用必填 patient.setHvillage(yunRequest.getHvillage()); @@ -2174,7 +2295,7 @@ public class BookbuildingFacade { result = getResult(p); result.setNextCheckTime(DateUtil.getyyyy_MM_dd(p.getNextCheckTime())); result.setcDueWeek(p.getcDueWeek()); - if(StringUtils.isNotEmpty(p.getYyzyfmHospitalId())){ + if (StringUtils.isNotEmpty(p.getYyzyfmHospitalId())) { Map doctorObj = new HashMap<>(); doctorObj.put("id", p.getYyzyfmHospitalId()); doctorObj.put("name", StringUtils.isNotEmpty(p.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(p.getYyzyfmHospitalId()) : ""); @@ -2255,17 +2376,17 @@ public class BookbuildingFacade { result.setPregnantCensusCityId(p.getCityRegisterId()); result.setPregnantCensusAreaId(p.getAreaRegisterId()); result.setPregnantCensusStreetId(p.getStreetRegisterId()); - String villageRegister="";//村 - String addressRegister="";//详细地址 - if(StringUtils.isNotEmpty(p.getAddressRegister())){ - addressRegister=p.getAddressRegister(); + String villageRegister = "";//村 + String addressRegister = "";//详细地址 + if (StringUtils.isNotEmpty(p.getAddressRegister())) { + addressRegister = p.getAddressRegister(); } //系统中村是后加字段。为了原系统展示，村和详细地址是拼接在一起的。这里要取门牌号需要截取掉村。 if (StringUtils.isNotEmpty(p.getVillageRegister())) { - villageRegister=p.getVillageRegister(); - if(StringUtils.isNotEmpty(addressRegister) && - addressRegister.length()>villageRegister.length()){ - addressRegister=addressRegister.substring(villageRegister.length()); + villageRegister = p.getVillageRegister(); + if (StringUtils.isNotEmpty(addressRegister) && + addressRegister.length() > villageRegister.length()) { + addressRegister = addressRegister.substring(villageRegister.length()); } } //增加村字段，出生证明需要用必填 @@ -2279,7 +2400,6 @@ public class BookbuildingFacade { result.setPregnantLiveAddr(p.getAddress()); - result.setChildbirthAddr(p.getAddressPostRest()); result.setChildbirthProvinceId(p.getProvincePostRestId()); result.setChildbirthCityId(p.getCityPostRestId()); @@ -2309,17 +2429,17 @@ public class BookbuildingFacade { result.setHcityId(p.getHcityId()); result.setHareaId(p.getHareaId()); result.setHstreetId(p.getHstreetId()); - String hvillage="";//村 - String haddress="";//详细地址 - if(StringUtils.isNotEmpty(p.getHaddress())){ - haddress=p.getHaddress(); + String hvillage = "";//村 + String haddress = "";//详细地址 + if (StringUtils.isNotEmpty(p.getHaddress())) { + haddress = p.getHaddress(); } //系统中村是后加字段。为了原系统展示，村和详细地址是拼接在一起的。这里要取门牌号需要截取掉村。 if (StringUtils.isNotEmpty(p.getHvillage())) { - hvillage=p.getHvillage(); - if(StringUtils.isNotEmpty(haddress) && - haddress.length()>hvillage.length()){ - haddress=haddress.substring(hvillage.length()); + hvillage = p.getHvillage(); + if (StringUtils.isNotEmpty(haddress) && + haddress.length() > hvillage.length()) { + haddress = haddress.substring(hvillage.length()); } } result.setHvillage(hvillage); @@ -2374,7 +2494,6 @@ public class BookbuildingFacade { result.setNormal(p.getNormal() == null ? "1" : p.getNormal()); - result.setMarriageAge(p.getMarriageAge()); result.setLevelTypeId(p.getLevelTypeId()); result.setMarriageStatus(p.getMarriageStatus()); @@ -2594,6 +2713,7 @@ public class BookbuildingFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + /** * 滦平定制 * @@ -2603,7 +2723,7 @@ public class BookbuildingFacade { * @Author: 武涛涛 * @Date: 2020/11/5 16:02 */ - public BaseObjectResponse queryHospitalsLp(Integer userId,String keyWord, Integer page, Integer limit) { + public BaseObjectResponse queryHospitalsLp(Integer userId, String keyWord, Integer page, Integer limit) { String hospitalId = autoMatchFacade.getHospitalId(userId); OrganizationQuery organizationQuery = new OrganizationQuery(); @@ -2623,7 +2743,7 @@ public class BookbuildingFacade { if (CollectionUtils.isNotEmpty(orgs)) { Map maplp = new HashMap<>(); for (Organization org : orgs) { - if(org.getId()!=null && org.getId().toString().equals(hospitalId)){ + if (org.getId() != null && org.getId().toString().equals(hospitalId)) { maplp.put("id", org.getId() + ""); maplp.put("name", org.getName()); } @@ -2633,10 +2753,10 @@ public class BookbuildingFacade { mapList.add(map); } mapList.add(maplp); - if(CollectionUtils.isNotEmpty(mapList)){ - Collections.swap(mapList, mapList.size()-1, 0); + if (CollectionUtils.isNotEmpty(mapList)) { + Collections.swap(mapList, mapList.size() - 1, 0); Map mapqt = new HashMap<>(); - mapqt.put("id","21000013770000001"+ ""); + mapqt.put("id", "21000013770000001" + ""); mapqt.put("name", "其他"); mapList.add(mapqt); } @@ -2650,6 +2770,7 @@ public class BookbuildingFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + /** * 获取医院列表，授权限限制 * @@ -2659,11 +2780,11 @@ public class BookbuildingFacade { * @Author: 武涛涛 * @Date: 2020/7/17 16:35 */ - public BaseObjectResponse queryHospitalsHs( Integer userId,String keyWord, Integer page, Integer limit) { + public BaseObjectResponse queryHospitalsHs(Integer userId, String keyWord, Integer page, Integer limit) { String hospitalId = autoMatchFacade.getHospitalId(userId); List hospitalList = new ArrayList<>(); - if(null!=hospitalId){ + if (null != hospitalId) { //当前用户本院 hospitalList.add(hospitalId); } @@ -3388,29 +3509,29 @@ public class BookbuildingFacade { } public BaseResponse updateTransientInfo(String pid, String pliveTypeId, String liveCardNo) { - BaseResponse br=new BaseResponse(); - if (StringUtils.isEmpty(pid)|| StringUtils.isEmpty(pliveTypeId)) { + BaseResponse br = new BaseResponse(); + if (StringUtils.isEmpty(pid) || StringUtils.isEmpty(pliveTypeId)) { br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); br.setErrormsg("参数不能为空"); return br; } Query query = Query.query(Criteria.where("pid").is(pid)); - mongoTemplate.updateMulti(query, Update.update("pliveTypeId", pliveTypeId).set("liveCardNo",liveCardNo), Patients.class); + mongoTemplate.updateMulti(query, Update.update("pliveTypeId", pliveTypeId).set("liveCardNo", liveCardNo), Patients.class); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); return br; } public Map getWifeHubbyAddress(String cardNo) { - Map map=new HashMap(); - Query query=new Query(); + Map map = new HashMap(); + Query query = new Query(); query.addCriteria(Criteria.where("yn").is(1)); query.addCriteria(Criteria.where("type").is(3)); query.addCriteria(Criteria.where("cardNo").is(cardNo)); query.with(new Sort(Sort.Direction.DESC, "created")); List patientsList = mongoTemplate.find(query, Patients.class); if (CollectionUtils.isNotEmpty(patientsList)) { - Patients patient=patientsList.get(0); + Patients patient = patientsList.get(0); //母亲户籍所在地-省 String MQHJSS = CommonsHelper.getName1(patient.getProvinceId(), basicConfigService); map.put("MQHJSS", StringUtils.isEmpty(MQHJSS) ? "/" : MQHJSS); @@ -3460,7 +3581,7 @@ public class BookbuildingFacade { String FQZZCT = ""; //门牌号（详细地址） String FQZZMPH = ""; - if(StringUtils.isNotEmpty(FQZZSS)) { + if (StringUtils.isNotEmpty(FQZZSS)) { //父 亲 住 址 - 省 （ 自 治 区、直辖市） map.put("FQZZSS", StringUtils.isEmpty(FQZZSS) ? "/" : FQZZSS); //父 亲 住 址 - 市 （ 地 区 、 州） @@ -3487,7 +3608,7 @@ public class BookbuildingFacade { map.put("FQZZMPH", StringUtils.isEmpty(FQZZMPH) ? "/" : FQZZMPH); //父 亲 住 址 行 政 区 划 代 码 map.put("FQ_ZZXZQHDM", organizationService.getAreaCode(FQZZQX)); - }else {//如果父亲没有填居住地，用妻子的居住地填充 + } else {//如果父亲没有填居住地，用妻子的居住地填充 //父 亲 住 址 - 省 （ 自 治 区、直辖市） map.put("FQZZSS", StringUtils.isEmpty(MQZZSS) ? "/" : MQZZSS); //父 亲 住 址 - 市 （ 地 区 、 州） @@ -3537,50 +3658,50 @@ public class BookbuildingFacade { //父亲户籍所在地-门牌号 map.put("FQHJMPH", StringUtils.isEmpty(patient.getHaddressRegister()) ? "/" : patient.getHaddressRegister()); //母亲证面地址详情，必填。单亲无母亲信息填“/”(出生证上面取得是户籍地) - String MQZMDZXQ="/"; - if(StringUtils.isNotEmpty(patient.getProvinceId()) && StringUtils.isNotEmpty(patient.getCityId()) && + String MQZMDZXQ = "/"; + if (StringUtils.isNotEmpty(patient.getProvinceId()) && StringUtils.isNotEmpty(patient.getCityId()) && StringUtils.isNotEmpty(patient.getAreaId()) && StringUtils.isNotEmpty(patient.getStreetId()) && - StringUtils.isNotEmpty(patient.getAddress())){ - MQZMDZXQ= CommonsHelper.getResidence(patient.getProvinceId(), patient.getCityId(), patient.getAreaId(), patient.getStreetId(), patient.getAddress(), basicConfigService); + StringUtils.isNotEmpty(patient.getAddress())) { + MQZMDZXQ = CommonsHelper.getResidence(patient.getProvinceId(), patient.getCityId(), patient.getAreaId(), patient.getStreetId(), patient.getAddress(), basicConfigService); } - map.put("MQZMDZXQ",MQZMDZXQ); + map.put("MQZMDZXQ", MQZMDZXQ); //父亲证面地址详情，必填，单亲无父亲信息填“/”(出生证上面取得是户籍地) - String FQZMDZXQ="/"; - if(StringUtils.isNotEmpty(patient.getHprovinceRegisterId()) && StringUtils.isNotEmpty(patient.getHcityRegisterId()) && + String FQZMDZXQ = "/"; + if (StringUtils.isNotEmpty(patient.getHprovinceRegisterId()) && StringUtils.isNotEmpty(patient.getHcityRegisterId()) && StringUtils.isNotEmpty(patient.getHareaRegisterId()) && StringUtils.isNotEmpty(patient.getHstreetRegisterId()) && - StringUtils.isNotEmpty(patient.getHaddressRegister())){ - FQZMDZXQ= CommonsHelper.getResidence(patient.getHprovinceRegisterId(), patient.getHcityRegisterId(), patient.getHareaRegisterId(), patient.getHstreetRegisterId(), patient.getHaddressRegister(), basicConfigService); + StringUtils.isNotEmpty(patient.getHaddressRegister())) { + FQZMDZXQ = CommonsHelper.getResidence(patient.getHprovinceRegisterId(), patient.getHcityRegisterId(), patient.getHareaRegisterId(), patient.getHstreetRegisterId(), patient.getHaddressRegister(), basicConfigService); } - map.put("FQZMDZXQ",FQZMDZXQ); + map.put("FQZMDZXQ", FQZMDZXQ); } return map; } - public BaseObjectResponse queryRecommend(RecommendQuery recommendQuery,Integer userId) { + public BaseObjectResponse queryRecommend(RecommendQuery recommendQuery, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); //预约分娩医院是当前登录医院 - if(StringUtils.isNotEmpty(hospitalId)){ + if (StringUtils.isNotEmpty(hospitalId)) { recommendQuery.setYyzyfmHospitalId(hospitalId); } //是否隐藏 更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检 recommendQuery.setExtEnable(false); MongoQuery query = recommendQuery.convertToQuery().addOrder(Sort.Direction.DESC, "bookbuildingDate"); AggregationOperation queryParam = Aggregation.match(query.getCriteria()); - AggregationOperation group = Aggregation.group("townOrgId","recommend"); + AggregationOperation group = Aggregation.group("townOrgId", "recommend"); AggregationOperation month = project(). andExpression("townOrgId").as("townOrgId"). andExpression("recommend").as("recommend"); - Aggregation aggregation= Aggregation.newAggregation(queryParam,month, group); + Aggregation aggregation = Aggregation.newAggregation(queryParam, month, group); final AggregationResults lyms_patient = mongoTemplate.aggregate(aggregation, "lyms_patient", Patients.class); - List result=new ArrayList<>(); + List result = new ArrayList<>(); for (Patients patients : lyms_patient) { recommendQuery.setRecommend(patients.getRecommend()); recommendQuery.setTownOrgId(patients.getTownOrgId()); final long count = mongoTemplate.count(recommendQuery.convertToQuery().convertToMongoQuery(), Patients.class); - Map map=new HashMap(); - map=MapUtil.beanToMap(patients); + Map map = new HashMap(); + map = MapUtil.beanToMap(patients); map.put("recommendCount", count); final String townOrgName = organizationService.getOrganizationName(patients.getTownOrgId()); map.put("townOrgName", townOrgName); @@ -3593,10 +3714,10 @@ public class BookbuildingFacade { return objectResponse; } - public BaseObjectResponse queryRecommendInfo(RecommendQuery recommendQuery,Integer userId) { + public BaseObjectResponse queryRecommendInfo(RecommendQuery recommendQuery, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); //预约分娩医院是当前登录医院 - if(StringUtils.isNotEmpty(hospitalId)){ + if (StringUtils.isNotEmpty(hospitalId)) { recommendQuery.setYyzyfmHospitalId(hospitalId); } //是否隐藏 更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检 @@ -3604,16 +3725,16 @@ public class BookbuildingFacade { MongoQuery query = recommendQuery.convertToQuery(); query.convertToMongoQuery().toString(); //分页后总数量 - recommendQuery.mysqlBuild((int)mongoTemplate.count(query.convertToMongoQuery(),Patients.class)); + recommendQuery.mysqlBuild((int) mongoTemplate.count(query.convertToMongoQuery(), Patients.class)); //分页 query.start(recommendQuery.getOffset()).end(recommendQuery.getLimit()); //排序 query.addOrder(Sort.Direction.DESC, "bookbuildingDate"); List patientses = mongoTemplate.find(query.convertToMongoQuery(), Patients.class); - List result=new ArrayList<>(); + List result = new ArrayList<>(); for (Patients patients : patientses) { //孕周 - String dueWeek=""; + String dueWeek = ""; try { if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { dueWeek = "已分娩"; @@ -3634,11 +3755,11 @@ public class BookbuildingFacade { final String residenceAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); //预约住院分娩医院 final String makeHospital = organizationService.getOrganizationName(patients.getYyzyfmHospitalId()); - Map map=new HashMap(); - map=MapUtil.beanToMap(patients); - map.put("dueWeek",dueWeek); - map.put("residenceAddress",residenceAddress); - map.put("makeHospital",makeHospital); + Map map = new HashMap(); + map = MapUtil.beanToMap(patients); + map.put("dueWeek", dueWeek); + map.put("residenceAddress", residenceAddress); + map.put("makeHospital", makeHospital); result.add(map); } BaseObjectResponse objectResponse = new BaseObjectResponse(); @@ -3649,8 +3770,8 @@ public class BookbuildingFacade { return objectResponse; } - public BaseObjectResponse queryAreaOrgs( Integer userId) { - Query query=new Query(); + public BaseObjectResponse queryAreaOrgs(Integer userId) { + Query query = new Query(); query.addCriteria(Criteria.where("id").exists(true)); List models = mongoTemplate.find(query, AreaAddressModel.class); BaseObjectResponse objectResponse = new BaseObjectResponse(); @@ -3667,17 +3788,17 @@ public class BookbuildingFacade { usersQuery.setYn(1); List list = usersService.queryUsers(usersQuery); BaseObjectResponse objectResponse = new BaseObjectResponse(); - if (list.size()==1){ + if (list.size() == 1) { Users userr = list.get(0); - Organization organization =masterOrganizationMapper.getOrganization(userr.getDeptId()); + Organization organization = masterOrganizationMapper.getOrganization(userr.getDeptId()); List basicConfigList = basicConfigDao.queryBasicConfig(MongoCondition.newInstance("parentId", organization.getAreaId(), MongoOper.IS). and("yn", YnEnums.YES.getId(), MongoOper.IS).toMongoQuery()); // Map map=new HashMap(); - List datas=new ArrayList<>(); - for (BasicConfig basicConfig : basicConfigList){ - Map map=new HashMap<>(); + List datas = new ArrayList<>(); + for (BasicConfig basicConfig : basicConfigList) { + Map map = new HashMap<>(); List basicConfigList1 = basicConfigDao.queryBasicConfig(MongoCondition.newInstance("parentId", basicConfig.getId(), MongoOper.IS). and("yn", YnEnums.YES.getId(), MongoOper.IS).toMongoQuery()); @@ -3688,8 +3809,8 @@ public class BookbuildingFacade { // map.put("parentId",basicConfig1.getParentId()); // Maplist.add(map); // } - map.put("basicConfigListname",basicConfig); - map.put("map",basicConfigList1); + map.put("basicConfigListname", basicConfig); + map.put("map", basicConfigList1); datas.add(map); } @@ -3697,7 +3818,7 @@ public class BookbuildingFacade { objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; - }else{ + } else { objectResponse.setData(null); objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); objectResponse.setErrormsg("失败"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java index 7cfc96d..6d84393 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java @@ -72,6 +72,7 @@ public class MybatisSqlInterceptor implements Interceptor { noUses.add("user_organization_maps"); noUses.add("user_role_maps"); noUses.add("lyms_week_project"); + noUses.add("lyms_factor_project"); } private String sql;