From 06b89b934f44a8da91c35b1eb4061646b3d1fdd0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 26 Mar 2021 15:38:52 +0800 Subject: [PATCH] Merge branch 'master' of E:\mycelipse_workspace\longmei\regional-platform with conflicts. --- .../lyms/platform/pojo/BabyHighRiskBabyModel.java | 12 +-- .../operate/web/facade/BabyHighRiskBabyFacade.java | 100 ++++++++++++--------- .../web/request/BabyHighRiskBabyRequest.java | 12 +-- 3 files changed, 69 insertions(+), 55 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java index e2d4e35..bd871da 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java @@ -204,7 +204,7 @@ public class BabyHighRiskBabyModel extends BaseModel { 4神经心理行为发育监测和评估 5特殊检查 */ - private Integer evalMethod; + private List evalMethod; //处理 /** @@ -214,22 +214,22 @@ public class BabyHighRiskBabyModel extends BaseModel { 4结案 5其他 */ - private Integer handle; + private List handle; private String handleOther; - public Integer getEvalMethod() { + public List getEvalMethod() { return evalMethod; } - public void setEvalMethod(Integer evalMethod) { + public void setEvalMethod(List evalMethod) { this.evalMethod = evalMethod; } - public Integer getHandle() { + public List getHandle() { return handle; } - public void setHandle(Integer handle) { + public void setHandle(List handle) { this.handle = handle; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index 92b9097..3d82854 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -62,8 +62,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { @Autowired private BasicConfigService basicConfigService; - @Autowired - private MongoTemplate mongoTemplate; + @Autowired private ApplyOrderService applyOrderService; @@ -293,7 +292,6 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { } return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - /** * 新增 高危儿专科 */ @@ -314,7 +312,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "高危儿专科检查"); try { //添加检查后更新转诊接受状态 - babyDepartmentReferralFacade.setAcceptStatus(model.getBuildId(), hospitalId, "gwer"); + babyDepartmentReferralFacade.setAcceptStatus(model.getBuildId(),hospitalId,"gwer"); } catch (Exception e) { e.printStackTrace(); } @@ -333,7 +331,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { public BaseResponse update(BabyHighRiskBabyRequest request, Integer userId) { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(userId); - if (StringUtils.isEmpty(request.getId())) { + if(StringUtils.isEmpty(request.getId())){ return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("ID不能为空"); } BabyHighRiskBabyModel model = getBabyHighRiskBabyModel(request); @@ -375,7 +373,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id); BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult(); highRiskBabyResult.convertToResult(babyHighRiskBabyModel); - if (StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz()) + if(StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz()) && StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz()) && StringUtils.isEmpty(babyHighRiskBabyModel.getXhdb()) && StringUtils.isEmpty(babyHighRiskBabyModel.getXzcc()) @@ -383,13 +381,13 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { && StringUtils.isEmpty(babyHighRiskBabyModel.getTlhc()) && StringUtils.isEmpty(babyHighRiskBabyModel.getZhipJoint()) && StringUtils.isEmpty(babyHighRiskBabyModel.getYhipJoint()) - && babyHighRiskBabyModel.getNdt() == null) { + && babyHighRiskBabyModel.getNdt()==null ){ highRiskBabyResult.setFzjcState("1"); } String bregma = ""; String bregmaValue = ""; - if (babyHighRiskBabyModel.getBregma() != null) { + if (babyHighRiskBabyModel.getBregma()!=null) { Map map = babyHighRiskBabyModel.getBregma(); String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString(); if ("yes".equals(yesOrNo)) { @@ -405,6 +403,10 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { highRiskBabyResult.setBregmaValue(bregmaValue); + + + + if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getCheckDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(babyHighRiskBabyModel.getCheckDoctor())); if (users != null && StringUtils.isNotEmpty(users.getName())) { @@ -429,6 +431,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { } + /** * 根据id,高危儿专科，编辑使用 */ @@ -576,6 +579,11 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { babyQuery.setBirthEnd(babyQuery.getBirthEnd()); } else { babyQuery.setBirthEnd(start); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + babyQuery.setBirthStart(end); + } + if (babyQuery.getBirthEnd() != null) { + babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); } } else if (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd()) { @@ -744,64 +752,68 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { public BaseResponse queryBabyRiskPrint(String id) { - Map data = new HashMap <>(); + Map data = new HashMap<>(); BabyModel babyModel = babyService.getOneBabyById(id); - data.put("babyName", babyModel.getName()); - data.put("babySex", babyModel.getSex()); - data.put("babyBirth", DateUtil.getyyyy_MM_dd(babyModel.getBirth())); + data.put("babyName",babyModel.getName()); + data.put("babySex",babyModel.getSex()); + data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); BabyHighRiskBabyModelQuery babyHighRiskBabyModelQuery = new BabyHighRiskBabyModelQuery(); babyHighRiskBabyModelQuery.setYn(YnEnums.YES.getId()); babyHighRiskBabyModelQuery.setBuildId(id); babyHighRiskBabyModelQuery.setSort("checkDate"); //查询高危儿专科的检查记录 - List checkModels = babyHighRiskBabyService.queryOne(babyHighRiskBabyModelQuery); - if (CollectionUtils.isNotEmpty(checkModels)) { + List checkModels = babyHighRiskBabyService.queryOne(babyHighRiskBabyModelQuery); + if (CollectionUtils.isNotEmpty(checkModels)) + { BabyHighRiskBabyModel riskBabyModel = checkModels.get(checkModels.size() - 1); - data.put("number", riskBabyModel.getNumber()); - data.put("manageDate", DateUtil.getyyyy_MM_dd(riskBabyModel.getCheckDate())); + data.put("number",riskBabyModel.getNumber()); + data.put("manageDate",DateUtil.getyyyy_MM_dd(riskBabyModel.getCheckDate())); ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(id); - List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); String referraHospital = ""; - if (CollectionUtils.isNotEmpty(list)) { + if (CollectionUtils.isNotEmpty(list)) + { ReferralApplyOrderModel orderModel = list.get(0); referraHospital = organizationService.getOrganization(Integer.parseInt(orderModel.getTransferredHospital())).getName(); } - data.put("referraHospital", referraHospital); - data.put("jwbqk", riskBabyModel.getJwbqk()); + data.put("referraHospital",referraHospital); + data.put("jwbqk",riskBabyModel.getJwbqk()); BabyHighRiskBabyModel riskBabyModel1 = checkModels.get(0); - data.put("zgStatus", riskBabyModel1.getZgStatus()); - data.put("closeDate", DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate())); + data.put("zgStatus",riskBabyModel1.getZgStatus()); + data.put("closeDate",DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate())); - String diagnoseValue = getHighRiskDiagnoseStr(riskBabyModel) + riskBabyModel.getHighRiskQt() == null ? "" : riskBabyModel.getHighRiskQt(); + String diagnoseValue = getHighRiskDiagnoseStr(riskBabyModel)+riskBabyModel.getHighRiskQt() == null ? "" : riskBabyModel.getHighRiskQt(); - data.put("diagnoseValue", diagnoseValue); + data.put("diagnoseValue",diagnoseValue); - List fzDatas = new LinkedList <>(); + List fzDatas = new LinkedList<>(); - for (BabyHighRiskBabyModel babyHighRiskBabyModel : checkModels) { - if ("fz".equals(babyHighRiskBabyModel.getCzOrfzProject())) { + for (BabyHighRiskBabyModel babyHighRiskBabyModel : checkModels) + { + if ("fz".equals(babyHighRiskBabyModel.getCzOrfzProject())) + { Map fzData = new HashMap(); - fzData.put("evalMethod", babyHighRiskBabyModel.getEvalMethod()); - fzData.put("weight", babyHighRiskBabyModel.getWeight()); - fzData.put("height", babyHighRiskBabyModel.getHeight()); + fzData.put("evalMethod",babyHighRiskBabyModel.getEvalMethod()); + fzData.put("weight",babyHighRiskBabyModel.getWeight()); + fzData.put("height",babyHighRiskBabyModel.getHeight()); fzData.put("head", babyHighRiskBabyModel.getHead()); fzData.put("handle", babyHighRiskBabyModel.getHandle()); fzData.put("handleOther", babyHighRiskBabyModel.getHandleOther()); StringBuffer exection = new StringBuffer(); - handleExecption(babyHighRiskBabyModel.getSkin(), exection); - handleExecption(babyHighRiskBabyModel.getWg(), exection); - handleExecption(babyHighRiskBabyModel.getTooth(), exection); - handleExecption(babyHighRiskBabyModel.getHeart(), exection); - handleExecption(babyHighRiskBabyModel.getLung(), exection); - handleExecption(babyHighRiskBabyModel.getAbdomen(), exection); - handleExecption(babyHighRiskBabyModel.getWszq(), exection); - handleExecption(babyHighRiskBabyModel.getJzsz(), exection); - handleExecption(babyHighRiskBabyModel.getSjxtjc(), exection); - handleExecption(babyHighRiskBabyModel.getXlxwfy(), exection); + handleExecption(babyHighRiskBabyModel.getSkin(),exection); + handleExecption(babyHighRiskBabyModel.getWg(),exection); + handleExecption(babyHighRiskBabyModel.getTooth(),exection); + handleExecption(babyHighRiskBabyModel.getHeart(),exection); + handleExecption(babyHighRiskBabyModel.getLung(),exection); + handleExecption(babyHighRiskBabyModel.getAbdomen(),exection); + handleExecption(babyHighRiskBabyModel.getWszq(),exection); + handleExecption(babyHighRiskBabyModel.getJzsz(),exection); + handleExecption(babyHighRiskBabyModel.getSjxtjc(),exection); + handleExecption(babyHighRiskBabyModel.getXlxwfy(),exection); fzData.put("exception", "".equals(exection.toString()) ? null : exection.toString()); @@ -814,13 +826,15 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { } } - data.put("fzDatas", fzDatas); + data.put("fzDatas",fzDatas); } return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - private void handleExecption(String value, StringBuffer sb) { - if (value != null && !"未见异常".equals(value)) { + private void handleExecption(String value,StringBuffer sb) + { + if (value != null && !"未见异常".equals(value)) + { sb.append(value); sb.append(" "); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java index d4caf97..6f23519 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java @@ -218,7 +218,7 @@ public class BabyHighRiskBabyRequest { 4神经心理行为发育监测和评估 5特殊检查 */ - private Integer evalMethod; + private List evalMethod; //处理 /** @@ -228,22 +228,22 @@ public class BabyHighRiskBabyRequest { 4结案 5其他 */ - private Integer handle; + private List handle; private String handleOther; - public Integer getEvalMethod() { + public List getEvalMethod() { return evalMethod; } - public void setEvalMethod(Integer evalMethod) { + public void setEvalMethod(List evalMethod) { this.evalMethod = evalMethod; } - public Integer getHandle() { + public List getHandle() { return handle; } - public void setHandle(Integer handle) { + public void setHandle(List handle) { this.handle = handle; } -- 1.8.3.1