From e4e9dc8649cf0bbe7516a75213e4fb2daa8d3fdf Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Mon, 6 May 2019 15:47:57 +0800 Subject: [PATCH] update --- .../web/controller/MatDeliverController.java | 355 ++++++++++----------- .../web/request/ChildbirthManagerRequest.java | 18 +- .../web/service/impl/TemporaryUserServiceImpl.java | 1 + 3 files changed, 180 insertions(+), 194 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index e13f8d7..c5c4c4a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -45,7 +45,7 @@ import java.util.*; * Created by Administrator on 2016/6/17 0017. */ @Controller -public class MatDeliverController extends BaseController{ +public class MatDeliverController extends BaseController { @Autowired private MatDeliverFacade matDeliverFacade; @@ -73,73 +73,70 @@ public class MatDeliverController extends BaseController{ * 查询分娩记录 * * @param deliverQueryRequest 分娩记录查询请求 - * - * @return 返回 + * @return 返回 */ - @RequestMapping(value = "/matmanger",method = RequestMethod.GET) + @RequestMapping(value = "/matmanger", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryMatDeliver(@Valid MatDeliverQueryRequest deliverQueryRequest,HttpServletRequest request) { + public BaseResponse queryMatDeliver(@Valid MatDeliverQueryRequest deliverQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return matDeliverFacade.queryMatDeliver(deliverQueryRequest,loginState.getId()); + return matDeliverFacade.queryMatDeliver(deliverQueryRequest, loginState.getId()); } /** - * * 增加分娩记录 * * @param deliverAddRequest 增加分娩记录 - * * @return 返回 */ - @RequestMapping(value = "/matdel",method = RequestMethod.POST) + @RequestMapping(value = "/matdel", method = RequestMethod.POST) @ResponseBody @TokenRequired - public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest,HttpServletRequest request){ + public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); BaseResponse baseResponse = matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, loginState.getId()); - if(StringUtils.isNotEmpty(deliverAddRequest.getCouponCode())){ + if (StringUtils.isNotEmpty(deliverAddRequest.getCouponCode())) { baseResponse.setObject(couponService.getPatientsInfoByCode(deliverAddRequest.getCouponCode())); } return baseResponse; } + /** * 删除一条删除记录 * * @param id 删除分娩记录 - * * @return 返回 */ - @RequestMapping(value = "/matdel",method = RequestMethod.DELETE) + @RequestMapping(value = "/matdel", method = RequestMethod.DELETE) @ResponseBody @TokenRequired - public BaseResponse delOneMatDeliver(@RequestParam("id") String id,HttpServletRequest httpServletRequest) { - if(StringUtils.isEmpty(id)){ - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空"); + public BaseResponse delOneMatDeliver(@RequestParam("id") String id, HttpServletRequest httpServletRequest) { + if (StringUtils.isEmpty(id)) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空"); } LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - return matDeliverFacade.delOneMatDeliver(id,loginState.getId()); + return matDeliverFacade.delOneMatDeliver(id, loginState.getId()); } /** * 查看某条分娩记录 * * @param id 删除记录id - * * @return 返回 */ - @RequestMapping(value = "/matdel",method = RequestMethod.GET) + @RequestMapping(value = "/matdel", method = RequestMethod.GET) @ResponseBody @TokenRequired public BaseResponse findOneMatDeliver(@RequestParam("id") String id) { - if(StringUtils.isEmpty(id)){ - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空"); + if (StringUtils.isEmpty(id)) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空"); } return matDeliverFacade.findOneMatDeliver(id); } + @RequestMapping(method = RequestMethod.GET, value = "/matdel/getenums") @ResponseBody - public BaseResponse getEnums(){ + public BaseResponse getEnums() { return matDeliverFacade.getEnums(); } @@ -151,6 +148,7 @@ public class MatDeliverController extends BaseController{ @TokenRequired @ResponseBody @RequestMapping(value = "childbirthManager", method = RequestMethod.POST) + //@RequestBody public BaseListResponse childbirthManager(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest) { BaseListResponse baseListResponse; @@ -195,8 +193,8 @@ public class MatDeliverController extends BaseController{ for (Object temp : childbirthManagerResult.getData()) { Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); - if(og!=null&&"2".equals(og.getCityId())&&childbirthManagerRequest.getShowDetail()==1){//需要隐藏姓名、地址 - if(temp instanceof ChildbirthManagerQueryModel){ + if (og != null && "2".equals(og.getCityId()) && childbirthManagerRequest.getShowDetail() == 1) {//需要隐藏姓名、地址 + if (temp instanceof ChildbirthManagerQueryModel) { ChildbirthManagerQueryModel result = (ChildbirthManagerQueryModel) temp; //出生医学证明卫纪委修改分娩记录可以查看到孕妇名称2018-04-28 // result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName())); @@ -291,13 +289,13 @@ public class MatDeliverController extends BaseController{ try { childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); - Map query = childbirthManagerRequest.getInitQueryMap(); + Map query = childbirthManagerRequest.getInitQueryMap(); String queryStr = ""; for (String key : query.keySet()) { queryStr += key + ","; } - childbirthManagerRequest.setInitQuery(queryStr+"fmTime"); + childbirthManagerRequest.setInitQuery(queryStr + "fmTime"); childbirthManagerRequest.setExcel(true); // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据 @@ -309,25 +307,25 @@ public class MatDeliverController extends BaseController{ Patients patients = patientsService.findOnePatientById(queryModel.getPatientId()); Map map = new LinkedHashMap<>(); - map.put("num",String.valueOf(num)); - map.put("dueDate",queryModel.getDueDate()); - map.put("fmTime",queryModel.getFmTime()); - if(StringUtils.isNotEmpty(queryModel.getBhnum())){ - map.put("zyNo"," "+queryModel.getBhnum()); - }else { + map.put("num", String.valueOf(num)); + map.put("dueDate", queryModel.getDueDate()); + map.put("fmTime", queryModel.getFmTime()); + if (StringUtils.isNotEmpty(queryModel.getBhnum())) { + map.put("zyNo", " " + queryModel.getBhnum()); + } else { map.put("zyNo", "-"); } - map.put("name",queryModel.getName()); + map.put("name", queryModel.getName()); map.put("age", String.valueOf(queryModel.getAge())); //居住地 String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); - map.put("liveAddress",liveAddress); + map.put("liveAddress", liveAddress); String regAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); - map.put("regAddress",regAddress); - map.put("phone",queryModel.getPhone()); + map.put("regAddress", regAddress); + map.put("phone", queryModel.getPhone()); /* AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); @@ -345,89 +343,87 @@ public class MatDeliverController extends BaseController{ map.put("yc",""); map.put("cc",""); }*/ - if(null == queryModel.getGravidity()){ - map.put("yc",""); - }else{ - map.put("yc",String.valueOf(queryModel.getGravidity())); + if (null == queryModel.getGravidity()) { + map.put("yc", ""); + } else { + map.put("yc", String.valueOf(queryModel.getGravidity())); } - if(null == queryModel.getDueCount()){ - map.put("cc",""); - }else{ - map.put("cc",String.valueOf(queryModel.getDueCount())); + if (null == queryModel.getDueCount()) { + map.put("cc", ""); + } else { + map.put("cc", String.valueOf(queryModel.getDueCount())); } - map.put("week",queryModel.getDueWeek()); + map.put("week", queryModel.getDueWeek()); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); //妊娠期高危因素 map.put("risk", highScoreResult.gethighRiskStr()); String a = ""; String m = ""; String y = ""; - Map amy = queryModel.getMyzd(); - if(null != amy && amy.size() > 0){ - if(null != amy.get("0")){ - if(true == (boolean)amy.get("0")){ + Map amy = queryModel.getMyzd(); + if (null != amy && amy.size() > 0) { + if (null != amy.get("0")) { + if (true == (boolean) amy.get("0")) { a = "√"; } } - if(null != amy.get("1")){ - if(true == (boolean)amy.get("1")){ + if (null != amy.get("1")) { + if (true == (boolean) amy.get("1")) { m = "√"; } } - if(null != amy.get("2")){ - if(true == (boolean)amy.get("2")){ + if (null != amy.get("2")) { + if (true == (boolean) amy.get("2")) { y = "√"; } } } - map.put("A",a); - map.put("M",m); - map.put("Y",y); + map.put("A", a); + map.put("M", m); + map.put("Y", y); String aModel1 = ""; String aModel2 = ""; String aModel3 = ""; String aModel4 = ""; //镇痛方式 - if("1".equals(queryModel.getZgnmz())){ + if ("1".equals(queryModel.getZgnmz())) { aModel1 = "√"; } - if("1".equals(queryModel.getDlfm())){ + if ("1".equals(queryModel.getDlfm())) { aModel2 = "√"; } - if("1".equals(queryModel.getFmzty())){ + if ("1".equals(queryModel.getFmzty())) { aModel3 = "√"; } - if("1".equals(queryModel.getZypbfm())){ + if ("1".equals(queryModel.getZypbfm())) { aModel4 = "√"; } - map.put("aModel1",aModel1); - map.put("aModel2",aModel2); - map.put("aModel3",aModel3); - map.put("aModel4",aModel4); + map.put("aModel1", aModel1); + map.put("aModel2", aModel2); + map.put("aModel3", aModel3); + map.put("aModel4", aModel4); String yidu = ""; String erdu = ""; String sandu = ""; String ceqie = ""; - if(null != queryModel.getSiLielevel()){ - if(1 == queryModel.getSiLielevel()){ + if (null != queryModel.getSiLielevel()) { + if (1 == queryModel.getSiLielevel()) { yidu = "√"; - } - else if(2 == queryModel.getSiLielevel()){ + } else if (2 == queryModel.getSiLielevel()) { erdu = "√"; - } - else if(3 == queryModel.getSiLielevel()){ + } else if (3 == queryModel.getSiLielevel()) { sandu = "√"; } } - map.put("yidu",yidu); - map.put("erdu",erdu); - map.put("sandu",sandu); - if("2".equals(queryModel.getIncision())){ + map.put("yidu", yidu); + map.put("erdu", erdu); + map.put("sandu", sandu); + if ("2".equals(queryModel.getIncision())) { ceqie = "√"; } - map.put("ceqie",ceqie); + map.put("ceqie", ceqie); //map.put("perinealCondition",queryModel.getPerinealCondition() == null ? "" : queryModel.getPerinealCondition()); map.put("fetalPosition", queryModel.getFetalPosition() == null ? "" : queryModel.getFetalPosition()); @@ -438,135 +434,119 @@ public class MatDeliverController extends BaseController{ String reslult5 = ""; String deliveryMode = queryModel.getDeliveryMode(); String deliveryMode1 = queryModel.getDeliveryMode1(); - if (deliveryMode != null && deliveryMode.contains("顺产")) - { + if (deliveryMode != null && deliveryMode.contains("顺产")) { reslult1 = "√"; } - if(deliveryMode1 != null && deliveryMode1.contains("胎吸")){ + if (deliveryMode1 != null && deliveryMode1.contains("胎吸")) { reslult2 = "√"; - } - else if(deliveryMode1 != null && deliveryMode1.contains("自由体位")){ + } else if (deliveryMode1 != null && deliveryMode1.contains("自由体位")) { reslult3 = "√"; - } - else if(deliveryMode1 != null && deliveryMode1.contains("臀牵引")){ + } else if (deliveryMode1 != null && deliveryMode1.contains("臀牵引")) { reslult4 = "√"; } - if (deliveryMode != null && deliveryMode.contains("剖宫产")) - { + if (deliveryMode != null && deliveryMode.contains("剖宫产")) { reslult5 = "√"; } - map.put("deliveryMode1",reslult1); + map.put("deliveryMode1", reslult1); map.put("deliveryMode2", reslult2); map.put("deliveryMode3", reslult3); - map.put("deliveryMode4",reslult4); - map.put("deliveryMode5",reslult5); - map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : String.valueOf(queryModel.getThloseBloodL())); - map.put("sex",queryModel.getSex()); - map.put("height",queryModel.getBabyHeight()); + map.put("deliveryMode4", reslult4); + map.put("deliveryMode5", reslult5); + map.put("thloseBloodL", queryModel.getThloseBloodL() == null ? "" : String.valueOf(queryModel.getThloseBloodL())); + map.put("sex", queryModel.getSex()); + map.put("height", queryModel.getBabyHeight()); int nu = 0; String weight = ""; - if (StringUtils.isNotEmpty(queryModel.getBabyWeight()) && queryModel.getBabyWeight().contains(",")) - { + if (StringUtils.isNotEmpty(queryModel.getBabyWeight()) && queryModel.getBabyWeight().contains(",")) { nu = 1; String arrs[] = queryModel.getBabyWeight().split(","); - for (int i = 0 ; i < arrs.length ; i++) - { + for (int i = 0; i < arrs.length; i++) { try { String w = String.valueOf(Double.parseDouble(arrs[i]) * 1000); int dex = w.indexOf("."); - if(-1 == dex){ - weight+=w+""; - }else{ - weight+=w.substring(0,dex)+""; + if (-1 == dex) { + weight += w + ""; + } else { + weight += w.substring(0, dex) + ""; } //weight+=(Double.parseDouble(arrs[i]) * 1000)+""; + } catch (Exception E) { + weight += arrs[i]; } - catch (Exception E) - { - weight+=arrs[i]; - } - if (i != arrs.length -1) - { + if (i != arrs.length - 1) { weight += ","; } } } - if(0 == nu && !"-".equals(queryModel.getBabyWeight())){ - if(StringUtils.isNotEmpty(queryModel.getBabyWeight())){ + if (0 == nu && !"-".equals(queryModel.getBabyWeight())) { + if (StringUtils.isNotEmpty(queryModel.getBabyWeight())) { String w = String.valueOf(Double.parseDouble(queryModel.getBabyWeight()) * 1000); int dex = w.indexOf("."); - if(-1 == dex){ - weight=w+""; - }else{ - weight=w.substring(0,dex)+""; + if (-1 == dex) { + weight = w + ""; + } else { + weight = w.substring(0, dex) + ""; } } //weight = (Double.parseDouble(queryModel.getBabyWeight()) * 1000)+""; - } - else if(0 == nu && "-".equals(queryModel.getBabyWeight()) && StringUtils.isNotEmpty(queryModel.getBabyWeight())){ + } else if (0 == nu && "-".equals(queryModel.getBabyWeight()) && StringUtils.isNotEmpty(queryModel.getBabyWeight())) { weight = queryModel.getBabyWeight(); } - map.put("weight",weight); + map.put("weight", weight); //评分 - map.put("apgarScorePf1",queryModel.getApgarScorePf1()); - map.put("apgarScorePf5",queryModel.getApgarScorePf5()); - map.put("apgarScorePf10",queryModel.getApgarScorePf10()); + map.put("apgarScorePf1", queryModel.getApgarScorePf1()); + map.put("apgarScorePf5", queryModel.getApgarScorePf5()); + map.put("apgarScorePf10", queryModel.getApgarScorePf10()); - map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation()); + map.put("malformation", queryModel.getMalformation() == null ? "" : queryModel.getMalformation()); //queryModel.getTireNumber()-queryModel.getLivingNumber() - map.put("sc",queryModel.getPregnancyOut());//死产 + map.put("sc", queryModel.getPregnancyOut());//死产 int bn = 0; String jcsc = ""; - if (queryModel.getContactM() != null && queryModel.getContactM().contains(",")) - { + if (queryModel.getContactM() != null && queryModel.getContactM().contains(",")) { bn = 1; String[] arrs = queryModel.getContactM().split(","); - for (int i = 0 ;i < arrs.length ; i++) - { - if ("1".equals(arrs[i])) - { + for (int i = 0; i < arrs.length; i++) { + if ("1".equals(arrs[i])) { jcsc += "√"; - } - else - { + } else { jcsc += "-"; } - if (i != arrs.length -1) - { + if (i != arrs.length - 1) { jcsc += ","; } } } - if(bn == 0 && !"-".equals(queryModel.getContactM())){ + if (bn == 0 && !"-".equals(queryModel.getContactM())) { jcsc += "√"; - }else if(bn == 0 && "-".equals(queryModel.getContactM())){ + } else if (bn == 0 && "-".equals(queryModel.getContactM())) { jcsc += queryModel.getContactM(); } - map.put("jzsx",jcsc);//皮肤接触及早吸吮≥30分钟 - map.put("xj","-");//宣教 - map.put("jsz",queryModel.getDeliverDoctor());//接生者 + map.put("jzsx", jcsc);//皮肤接触及早吸吮≥30分钟 + map.put("xj", "-");//宣教 + map.put("jsz", queryModel.getDeliverDoctor());//接生者 //科室 String department1 = ""; String department2 = ""; - if("1".equals(queryModel.getDepartment())){ - department1= "√"; - }else if("2".equals(queryModel.getDepartment())){ - department2= "√"; + if ("1".equals(queryModel.getDepartment())) { + department1 = "√"; + } else if ("2".equals(queryModel.getDepartment())) { + department2 = "√"; } - map.put("department1",department1); - map.put("department2",department2); + map.put("department1", department1); + map.put("department2", department2); - map.put("remark",patients.getMremark() == null ? "" : patients.getMremark());//备注42列 + map.put("remark", patients.getMremark() == null ? "" : patients.getMremark());//备注42列 num++; list.add(map); } httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("分娩登记表.xls").getBytes("UTF-8"), "ISO-8859-1")); - String path = this.getClass().getResource("/").getPath()+ "fm_record.xls"; + String path = this.getClass().getResource("/").getPath() + "fm_record.xls"; ExcelUtil.writeWhExclFile(path, httpServletResponse.getOutputStream(), list); } catch (Exception e) { @@ -575,7 +555,6 @@ public class MatDeliverController extends BaseController{ } - /** * @auther HuJiaqi * @createTime 2016年12月07日 17时50分 @@ -588,7 +567,7 @@ public class MatDeliverController extends BaseController{ BaseListResponse baseListResponse; try { newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); - NewBabyManagerResult newBabyManagerResult = matDeliverFacade.newBabyManager(newBabyManagerRequest,getUserId(httpServletRequest)); + NewBabyManagerResult newBabyManagerResult = matDeliverFacade.newBabyManager(newBabyManagerRequest, getUserId(httpServletRequest)); if (newBabyManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { baseListResponse = new BaseListResponse().setErrorcode(newBabyManagerResult.getErrorcode()).setErrormsg(newBabyManagerResult.getErrormsg()); return baseListResponse; @@ -609,7 +588,7 @@ public class MatDeliverController extends BaseController{ newBabyManagerRequest.setExcel(true); // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据 @SuppressWarnings("unchecked") - List newBabyManagerQueryModelList = matDeliverFacade.newBabyManager(newBabyManagerRequest,getUserId(httpServletRequest)).getData(); + List newBabyManagerQueryModelList = matDeliverFacade.newBabyManager(newBabyManagerRequest, getUserId(httpServletRequest)).getData(); List> list = new ArrayList<>(); int num = 1; for (NewBabyManagerQueryModel newBabyManagerQueryModel : newBabyManagerQueryModelList) { @@ -642,17 +621,16 @@ public class MatDeliverController extends BaseController{ } Integer deformity = newBabyManagerQueryModel.getDeformity(); - map.put("jx",deformity == null ? "" : (deformity == 1 ? "是" : "否")); + map.put("jx", deformity == null ? "" : (deformity == 1 ? "是" : "否")); Patients patients = patientsService.findOnePatientById(newBabyManagerQueryModel.getPatientId()); - if (patients != null) - { + if (patients != null) { //居住地 String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); - map.put("liveAddress",liveAddress); + map.put("liveAddress", liveAddress); //户籍地址 String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), @@ -669,11 +647,11 @@ public class MatDeliverController extends BaseController{ //妊娠期高危因素 map.put("risk", highScoreResult.gethighRiskStr()); - map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName()); - map.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); + map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName()); + map.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); - map.put("yc",newBabyManagerQueryModel.getGravidity() == null ? "" : newBabyManagerQueryModel.getGravidity()); - map.put("cc",newBabyManagerQueryModel.getDueCount() == null ? "" : newBabyManagerQueryModel.getDueCount()); + map.put("yc", newBabyManagerQueryModel.getGravidity() == null ? "" : newBabyManagerQueryModel.getGravidity()); + map.put("cc", newBabyManagerQueryModel.getDueCount() == null ? "" : newBabyManagerQueryModel.getDueCount()); // AntExChuQuery antExChuQuery = new AntExChuQuery(); // antExChuQuery.setYn(YnEnums.YES.getId()); @@ -686,15 +664,14 @@ public class MatDeliverController extends BaseController{ // map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); // // } - map.put("ts",newBabyManagerQueryModel.getTireNumber() == null ? "" : newBabyManagerQueryModel.getTireNumber()); + map.put("ts", newBabyManagerQueryModel.getTireNumber() == null ? "" : newBabyManagerQueryModel.getTireNumber()); - if (StringUtils.isNotEmpty(patients.getFmHospital())) - { + if (StringUtils.isNotEmpty(patients.getFmHospital())) { Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getFmHospital())); - map.put("fmHospital",organization != null ? organization.getName() : ""); + map.put("fmHospital", organization != null ? organization.getName() : ""); } - map.put("mremark", patients.getMremark() == null ? "" : patients.getMremark()); + map.put("mremark", patients.getMremark() == null ? "" : patients.getMremark()); } map.put("num", num); list.add(map); @@ -710,23 +687,23 @@ public class MatDeliverController extends BaseController{ header.put("babyWeight", "体重g"); header.put("fmDate", "出生时间(具体到分)"); header.put("addressRegister", "产妇户籍地"); - header.put("liveAddress","居住地"); + header.put("liveAddress", "居住地"); header.put("postRest", "产后休养地址"); header.put("risk", "妊娠期高危因素"); header.put("mphone", "联系方式"); header.put("mcertNo", "母亲证件号"); header.put("husbandName", "丈夫姓名"); header.put("husbandPhone", "丈夫联系电话"); - header.put("yc","孕次"); - header.put("cc","产次"); - header.put("ts","胎数"); + header.put("yc", "孕次"); + header.put("cc", "产次"); + header.put("ts", "胎数"); header.put("dueType", "分娩方式"); header.put("fmWeek", "分娩孕周"); header.put("jx", "外观是否正常"); header.put("deliverDoctor", "接生医生"); header.put("birthDays", "出生天数"); header.put("highRisk", "是否高危"); - header.put("fmHospital","接生医院"); + header.put("fmHospital", "接生医院"); header.put("mremark", "备注"); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("新生儿出生电子报告卡.xls").getBytes("UTF-8"), "ISO-8859-1")); @@ -738,6 +715,7 @@ public class MatDeliverController extends BaseController{ /** * 育龄服务生孩统计 + * * @param request * @param birth * @return @@ -746,17 +724,18 @@ public class MatDeliverController extends BaseController{ @ResponseBody @RequestMapping(value = "getChildbearAgeCount", method = RequestMethod.GET) public BaseObjectResponse getChildbearAgeCount(HttpServletRequest request, - @RequestParam(required = false) String birth, - @RequestParam(required = false) String hospitalId, - @RequestParam(required = false) String proviceId, - @RequestParam(required = false) String cityId, - @RequestParam(required = false) String areaId) { + @RequestParam(required = false) String birth, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String proviceId, + @RequestParam(required = false) String cityId, + @RequestParam(required = false) String areaId) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return matDeliverFacade.getChildbearAgeCount(birth,loginState.getId(),hospitalId,proviceId,cityId,areaId); + return matDeliverFacade.getChildbearAgeCount(birth, loginState.getId(), hospitalId, proviceId, cityId, areaId); } /** * 育龄服务生孩统计导出 + * * @param request * @param birth * @return @@ -765,12 +744,12 @@ public class MatDeliverController extends BaseController{ @ResponseBody @RequestMapping(value = "exportChildbearAgeCount", method = RequestMethod.GET) public void exportChildbearAgeCount(HttpServletRequest request, - @RequestParam(required = false) String birth, - @RequestParam(required = false) String hospitalId, - @RequestParam(required = false) String proviceId, - @RequestParam(required = false) String cityId, - @RequestParam(required = false) String areaId, - HttpServletResponse httpServletResponse) { + @RequestParam(required = false) String birth, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String proviceId, + @RequestParam(required = false) String cityId, + @RequestParam(required = false) String areaId, + HttpServletResponse httpServletResponse) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); matDeliverFacade.exportChildbearAgeCount(birth, loginState.getId(), hospitalId, proviceId, cityId, areaId, httpServletResponse); } @@ -778,6 +757,7 @@ public class MatDeliverController extends BaseController{ /** * 助产机构报表 + * * @param request * @param time * @param hospitalId @@ -789,18 +769,19 @@ public class MatDeliverController extends BaseController{ @ResponseBody @RequestMapping(value = "getDueOrgCount", method = RequestMethod.GET) public BaseObjectResponse getDueOrgCount(HttpServletRequest request, - @RequestParam(required = true) String time, - @RequestParam(required = false) String hospitalId, - @RequestParam(required = true) String proviceId, - @RequestParam(required = true) String cityId, - @RequestParam(required = false) String areaId) { + @RequestParam(required = true) String time, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = true) String proviceId, + @RequestParam(required = true) String cityId, + @RequestParam(required = false) String areaId) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return matDeliverFacade.getDueOrgCount(time, loginState.getId(), hospitalId, proviceId, cityId, areaId); } /** - *助产机构报表导出 + * 助产机构报表导出 + * * @param request * @param hospitalId * @param proviceId @@ -812,12 +793,12 @@ public class MatDeliverController extends BaseController{ @ResponseBody @RequestMapping(value = "exporDueOrgCount", method = RequestMethod.GET) public void exporDueOrgCount(HttpServletRequest request, - @RequestParam(required = false) String time, - @RequestParam(required = false) String hospitalId, - @RequestParam(required = false) String proviceId, - @RequestParam(required = false) String cityId, - @RequestParam(required = false) String areaId, - HttpServletResponse httpServletResponse) { + @RequestParam(required = false) String time, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String proviceId, + @RequestParam(required = false) String cityId, + @RequestParam(required = false) String areaId, + HttpServletResponse httpServletResponse) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); matDeliverFacade.exporDueOrgCount(time, loginState.getId(), hospitalId, proviceId, cityId, areaId, httpServletResponse); } 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 b513ad1..e4bbddb 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 @@ -484,8 +484,8 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMap.put("vcCardNo", "卡号"); initQueryMap.put("fileCode", "住院号（暂时塞的档案编号）"); initQueryMap.put("fmHospital", "分娩机构"); - initQueryMap.put("gcStatus","产后观察"); - initQueryMap.put("recordsNum","记录条数"); + initQueryMap.put("gcStatus", "产后观察"); + initQueryMap.put("recordsNum", "记录条数"); initQueryMap.put("maternalDeliverId", ""); initQueryMap.put("patientId", ""); initQueryMap.put("pid", ""); @@ -503,12 +503,16 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { normalQueryMap.put("tireNumber", "胎数"); normalQueryMap.put("livingNumber", "活产数"); normalQueryMap.put("deliverDoctor", "接生医生"); - normalQueryMap.put("phone", "联系方式"); - normalQueryMap.put("gcStatus","产后观察"); - normalQueryMap.put("recordsNum","记录条数"); + normalQueryMap.put("gcStatus", "产后观察"); + normalQueryMap.put("recordsNum", "记录条数"); normalQueryMap.put("maternalDeliverId", ""); + normalQueryMap.put("phone", "联系方式"); normalQueryMap.put("patientId", ""); normalQueryMap.put("pid", ""); + normalQueryMap.put("asphyxiaM", "窒息分钟数"); + normalQueryMap.put("babyWeight", "儿童体重"); + normalQueryMap.put("rhloseBloodL", "产后24小时内失血量"); + Map areaQueryMap = new LinkedHashMap<>(); areaQueryMap.put("apgarScorePf1", "Apgar1分钟"); areaQueryMap.put("apgarScorePf5", "Apgar5分钟"); @@ -524,8 +528,8 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { areaQueryMap.put("livingNumber", "活产数"); areaQueryMap.put("address", "居住地"); areaQueryMap.put("fmHospital", "分娩机构"); - areaQueryMap.put("gcStatus","产后观察"); - areaQueryMap.put("recordsNum","记录条数"); + areaQueryMap.put("gcStatus", "产后观察"); + areaQueryMap.put("recordsNum", "记录条数"); areaQueryMap.put("maternalDeliverId", ""); areaQueryMap.put("patientId", ""); areaQueryMap.put("pid", ""); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java index 7b62fec..88fce98 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java @@ -189,6 +189,7 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor } map.put("name", basicConfig.getName()); map.put("id", basicConfig.getId()); + map.put("code", basicConfig.getCode()); listMap.add(map); } } -- 1.8.3.1