diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 9cf5099..742ed5e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -6,9 +6,17 @@ package com.lyms.platform.operate.web; public class Test { public static void main(String[] args) { - String a = "3.220.33"; - int b = a.lastIndexOf('.'); - System.out.println("-----:"+b); + // String a = "3.220.33"; + // int b = a.lastIndexOf('.'); + // System.out.println("-----:"+b); + // List arrayList = new ArrayList<>(); + // arrayList.add(3,"aaa"); + // System.out.println(arrayList.size()); + String[] strs = new String[4]; + strs[0] = "111"; + strs[2] = "111"; + strs[3] = "111"; + strs[1] = "111"; // ConfirmedEnums [] strs = ConfirmedEnums.values(); // String vas = ConfirmedEnums.getTitle(1); @@ -88,7 +96,7 @@ public class Test { // } // } - System.out.println(39/20); + System.out.println(39 / 20); // String sql = "INSERT INTO LIS_REPORT_TBL( LIS_ID, TITLE) VALUES ('122', 'bbbb')"; // sql = sql.replaceFirst("\\(","(ID,"); // diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index fb248ed..1fbf7e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.ViewFacade; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -17,6 +18,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.Map; +import java.util.List; /** * 所有查看页面接口 @@ -28,7 +30,8 @@ public class ViewController extends BaseController { @Autowired private ViewFacade viewFacade; - + @Autowired + private AntenatalExaminationFacade antenatalExaminationFacade; /** * 查询初诊接口 @@ -47,18 +50,57 @@ public class ViewController extends BaseController { } /** - * 下载word + * 下载初诊word * * @param id * @param request * @return */ @RequestMapping(value = "/downExChuData", method = RequestMethod.GET) - @TokenRequired + // @TokenRequired public void downExChuData(@RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Map map = viewFacade.exChuData(id, loginState.getId()); + // Map map = viewFacade.exChuData(id, loginState.getId()); + Map map = viewFacade.exChuData(id, 1000000185); + + if (map == null) { + return; + } + + try { + // 验证License + if (!getLicense()) { + return; + } + Document doc = null;// 原始word路径 + try { + doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部).dotx"); + specialData(doc, map);//特殊数据 + markData(doc, map);//普通数据 + sendToBrowser(doc, "导出", "doc", true, response); + } catch (Exception e) { + e.printStackTrace(); + } + response.flushBuffer(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 下载复诊word + * + * @param id + * @param request + * @return + */ + @RequestMapping(value = "/downExFuData", method = RequestMethod.GET) + // @TokenRequired + public void downExFuData(@RequestParam("id") String id,int num, HttpServletRequest request, HttpServletResponse response) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + + Map map = viewFacade.exFuData(id, num); if (map == null) { return; @@ -84,6 +126,7 @@ public class ViewController extends BaseController { } } + public void specialData(Document doc, Map data) { try { DocumentBuilder builder = new DocumentBuilder(doc); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 98908bb..ca90cd2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -23,9 +23,11 @@ import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.*; @@ -247,6 +249,126 @@ public class ViewFacade { } /** + * 导出复诊查询 + * + * @param id 复诊id + * @param num 当前位置 + * @return + */ + public Map exFuData(String id, int num) { + Map map = new HashedMap(); + Patients patients = patientsService.findOnePatientById(""); + + + AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4]; + + AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id); + if (num < 3) { + exData[num - 1] = antenatalExaminationModel; + } else {//全部 + String patientsId = antenatalExaminationModel.getParentId(); + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setParentId(patientsId); + + //复诊 + List list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate")); + exData[0] = list.get(0); + exData[1] = list.get(1); + exData[2] = list.get(2); + exData[3] = list.get(3); + + } + + // Map map = new HashMap<>(); + for (int i = 0; i < exData.length; i++) { + AntenatalExaminationModel data = exData[i]; + if (data == null) { + continue; + } + String numStr = ""; + if (i == 0) { + numStr = "one"; + } else if (i == 1) { + numStr = "two"; + } else if (i == 2) { + numStr = "thre"; + } else if (i == 3) { + numStr = "four"; + } + + if (data.getCheckDate() != null) { + map.put(numStr + "checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate())); + } + map.put(numStr + "currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); + if (StringUtils.isNotEmpty(data.getChiefComplaint())) { + map.put(numStr + "chiefComplaint", data.getChiefComplaint()); + } + if (data.getWeight() != null) { + map.put(numStr + "weight", UnitUtils.unitSplice(data.getWeight(), UnitConstants.KG)); + } + if (StringUtils.isNotEmpty(data.getGongGao())) { + map.put(numStr + "gongGao", UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM)); + } + if (StringUtils.isNotEmpty(data.getAbdominalCircumference())) { + map.put(numStr + "abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM)); + } + if (CollectionUtils.isNotEmpty(data.getTireData())) { + StringBuffer fposiSb = new StringBuffer(); + StringBuffer hrateSb = new StringBuffer(); + for (Object temp : data.getTireData()) { + Map tire = JsonUtil.getMap(temp.toString()); + if (tire != null) { + String heartRate = tire.get("heartRate"); + String fetalPosition = tire.get("fetalPosition"); + hrateSb.append(UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN) + "/"); + fposiSb.append(FetalPositionEnums.getTitle(fetalPosition) + "/"); + } + } + if (StringUtils.isNotEmpty(hrateSb.toString())) { + map.put(numStr + "heartRate", hrateSb.toString()); + } + if (StringUtils.isNotEmpty(fposiSb.toString())) { + map.put(numStr + "fetalPosition", fposiSb.toString()); + } + } + Map chBpMap = JsonUtil.getMap(data.getBp()); + if (MapUtils.isNotEmpty(chBpMap)) { + if (StringUtils.isNotEmpty(chBpMap.get("ssy"))) { + map.put(numStr + "ssy", chBpMap.get("ssy")); + } + if (StringUtils.isNotEmpty(chBpMap.get("szy"))) { + map.put(numStr + "szy", chBpMap.get("szy")); + } + } + if (StringUtils.isNotEmpty(data.getHemoglobin())) { + map.put(numStr + "hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL)); + } + if (StringUtils.isNotEmpty(data.getUrineProtein())) { + map.put(numStr + "urineProtein", data.getUrineProtein()); + + } + if (StringUtils.isNotEmpty(data.getbChao())) { + map.put(numStr + "bChao", data.getbChao()); + + } + if (data.getNextCheckTime() != null) { + map.put(numStr + "nextCheckTime", DateUtil.getyyyy_MM_dd(data.getNextCheckTime())); + } + String checkDoctor = ""; + + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getCheckDoctor())) { + Users users = usersService.getUsers(Integer.parseInt(data.getCheckDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + checkDoctor = users.getName(); + } + } + map.put(numStr + "checkDoctor", checkDoctor); + } + return map; + } + + /** * 导出初诊 * * @param id @@ -261,6 +383,12 @@ public class ViewFacade { br.setErrormsg("id为空"); return null; } + String hospitId = autoMatchFacade.getHospitalId(userId); + + AntExChuQuery antExQuery = new AntExChuQuery(); + antExQuery.setParentId(id); + antExQuery.setHospitalId(hospitId); + List antExChuModels = antExService.queryAntExChu(antExQuery); AntExChuModel data = antExService.findOne(id); if (data == null || data.getYn() == YnEnums.NO.getId()) { @@ -286,7 +414,7 @@ public class ViewFacade { Map map = new HashMap<>(); /* 基本信息 */ //孕妇基本信息 - map.put("id", data.getId()); + map.put("parentId", data.getParentId()); map.put("name", patients.getUsername()); Calendar calendar = Calendar.getInstance(); map.put("inYear", calendar.get(Calendar.YEAR)); @@ -316,10 +444,10 @@ public class ViewFacade { if (data.getLastMenses() != null) { Calendar lastCal = Calendar.getInstance(); lastCal.setTime(data.getLastMenses()); - int mYear = lastCal.get(Calendar.YEAR); + int mYear = lastCal.get(Calendar.YEAR); map.put("mYear", String.valueOf(mYear)); - int mMonth =lastCal.get(Calendar.MONTH); - map.put("mMonth", String.valueOf(mMonth)); + int mMonth = lastCal.get(Calendar.MONTH); + map.put("mMonth", String.valueOf(mMonth + 1)); int mDay = lastCal.get(Calendar.DAY_OF_MONTH); map.put("mDay", String.valueOf(mDay)); } @@ -330,7 +458,7 @@ public class ViewFacade { int yYear = dueCal.get(Calendar.YEAR); map.put("yYear", String.valueOf(yYear)); int yMonth = dueCal.get(Calendar.MONTH); - map.put("yMonth", String.valueOf(yMonth)); + map.put("yMonth", String.valueOf(yMonth + 1)); int yDay = dueCal.get(Calendar.DAY_OF_MONTH); map.put("yDay", String.valueOf(yDay)); } @@ -488,148 +616,148 @@ public class ViewFacade { } - if(StringUtils.isNotEmpty(data.getHeart())){ - if("未见异常".equals(data.getHeart())){ + if (StringUtils.isNotEmpty(data.getHeart())) { + if ("未见异常".equals(data.getHeart())) { map.put("heart", "1"); - }else{ + } else { map.put("heart", "2"); map.put("heartOther", data.getHeart()); } } - if(StringUtils.isNotEmpty(data.getLungs())){ - if("未见异常".equals(data.getLungs())){ + if (StringUtils.isNotEmpty(data.getLungs())) { + if ("未见异常".equals(data.getLungs())) { map.put("lungs", "1"); - }else{ + } else { map.put("lungs", "2"); map.put("lungsOther", data.getLungs()); } } - if(StringUtils.isNotEmpty(data.getVulva())){ - if("未见异常".equals(data.getVulva())){ + if (StringUtils.isNotEmpty(data.getVulva())) { + if ("未见异常".equals(data.getVulva())) { map.put("vulva", "1"); - }else{ + } else { map.put("vulva", "2"); map.put("vulvaOther", data.getVulva()); } } - if(StringUtils.isNotEmpty(data.getVagina())){ - if("未见异常".equals(data.getVagina())){ + if (StringUtils.isNotEmpty(data.getVagina())) { + if ("未见异常".equals(data.getVagina())) { map.put("vagina", "1"); - }else{ + } else { map.put("vagina", "2"); map.put("vaginaOther", data.getVagina()); } } - if(StringUtils.isNotEmpty(data.getCervical())){ - if("未见异常".equals(data.getCervical())){ + if (StringUtils.isNotEmpty(data.getCervical())) { + if ("未见异常".equals(data.getCervical())) { map.put("cervical", "1"); - }else{ + } else { map.put("cervical", "2"); map.put("cervicalOther", data.getCervical()); } } - if(StringUtils.isNotEmpty(data.getUterus())){ - if("未见异常".equals(data.getUterus())){ + if (StringUtils.isNotEmpty(data.getUterus())) { + if ("未见异常".equals(data.getUterus())) { map.put("uterus", "1"); - }else{ + } else { map.put("uterus", "2"); map.put("uterusOther", data.getUterus()); } } - if(StringUtils.isNotEmpty(data.getFujian())){ - if("未见异常".equals(data.getFujian())){ + if (StringUtils.isNotEmpty(data.getFujian())) { + if ("未见异常".equals(data.getFujian())) { map.put("fujian", "1"); - }else{ + } else { map.put("fujian", "2"); map.put("fujianOther", data.getFujian()); } } /* 辅助检查 */ - if(StringUtils.isNotEmpty(data.getXhdb())){ - map.put("xhdb", data.getXhdb()); - } - if(StringUtils.isNotEmpty(data.getBxbjs())){ + if (StringUtils.isNotEmpty(data.getXhdb())) { + map.put("xhdb", data.getXhdb()); + } + if (StringUtils.isNotEmpty(data.getBxbjs())) { map.put("bxbjs", data.getBxbjs()); } - if(StringUtils.isNotEmpty(data.getPlatelet())) { + if (StringUtils.isNotEmpty(data.getPlatelet())) { map.put("platelet", data.getPlatelet()); } - if(StringUtils.isNotEmpty(data.getChgOther())) { + if (StringUtils.isNotEmpty(data.getChgOther())) { map.put("chgOther", data.getChgOther()); } - if(StringUtils.isNotEmpty(data.getNdb())) { + if (StringUtils.isNotEmpty(data.getNdb())) { map.put("ndb", data.getNdb()); } - if(StringUtils.isNotEmpty(data.getNt())) { + if (StringUtils.isNotEmpty(data.getNt())) { map.put("nt", data.getNt()); } - if(StringUtils.isNotEmpty(data.getUrineKetone())) { + if (StringUtils.isNotEmpty(data.getUrineKetone())) { map.put("urineKetone", data.getUrineKetone()); } - if(StringUtils.isNotEmpty(data.getBld())) { + if (StringUtils.isNotEmpty(data.getBld())) { map.put("bld", data.getBld()); } - if(StringUtils.isNotEmpty(data.getNcgOther())) { + if (StringUtils.isNotEmpty(data.getNcgOther())) { map.put("ncgOther", data.getNcgOther()); } - if(StringUtils.isNotEmpty(data.getAbo())) { + if (StringUtils.isNotEmpty(data.getAbo())) { map.put("abo", FunvCommonUtil.getBaseicConfigByid(data.getAbo(), basicConfigService)); } - if(StringUtils.isNotEmpty(data.getRh())) { + if (StringUtils.isNotEmpty(data.getRh())) { map.put("rh", FunvCommonUtil.checkYiGan(data.getRh())); } - if(StringUtils.isNotEmpty(data.getBloodSugar())) { + if (StringUtils.isNotEmpty(data.getBloodSugar())) { map.put("bloodSugar", data.getBloodSugar()); } - if(StringUtils.isNotEmpty(data.getXqgbzam())) { + if (StringUtils.isNotEmpty(data.getXqgbzam())) { map.put("xqgbzam", data.getXqgbzam()); } - if(StringUtils.isNotEmpty(data.getXqgczam())) { + if (StringUtils.isNotEmpty(data.getXqgczam())) { map.put("xqgczam", data.getXqgczam()); } - if(StringUtils.isNotEmpty(data.getAlbumin())) { + if (StringUtils.isNotEmpty(data.getAlbumin())) { map.put("albumin", data.getAlbumin()); } - if(StringUtils.isNotEmpty(data.getTotalBilirubin())) { + if (StringUtils.isNotEmpty(data.getTotalBilirubin())) { map.put("totalBilirubin", data.getTotalBilirubin()); } - if(StringUtils.isNotEmpty(data.getJhBilirubin())) { + if (StringUtils.isNotEmpty(data.getJhBilirubin())) { map.put("jhBilirubin", data.getJhBilirubin()); } - if(StringUtils.isNotEmpty(data.getBg())) { + if (StringUtils.isNotEmpty(data.getBg())) { map.put("bg", FunvCommonUtil.checkYiGan(data.getBg())); } - if(StringUtils.isNotEmpty(data.getYgbmky())) { + if (StringUtils.isNotEmpty(data.getYgbmky())) { map.put("ygbmky", FunvCommonUtil.checkYiGan(data.getYgbmky())); } - if(StringUtils.isNotEmpty(data.getYgbmkt())) { + if (StringUtils.isNotEmpty(data.getYgbmkt())) { map.put("ygbmkt", FunvCommonUtil.checkYiGan(data.getYgbmkt())); } - if(StringUtils.isNotEmpty(data.getYgeky())) { + if (StringUtils.isNotEmpty(data.getYgeky())) { map.put("ygeky", FunvCommonUtil.checkYiGan(data.getYgeky())); } - if(StringUtils.isNotEmpty(data.getYgekt())) { + if (StringUtils.isNotEmpty(data.getYgekt())) { map.put("ygekt", FunvCommonUtil.checkYiGan(data.getYgekt())); } - if(StringUtils.isNotEmpty(data.getYghxkt())) { + if (StringUtils.isNotEmpty(data.getYghxkt())) { map.put("yghxkt", FunvCommonUtil.checkYiGan(data.getYghxkt())); } - if(StringUtils.isNotEmpty(data.getXqjq())) { + if (StringUtils.isNotEmpty(data.getXqjq())) { map.put("xqjq", data.getXqjq()); } - if(StringUtils.isNotEmpty(data.getXnsd())) { + if (StringUtils.isNotEmpty(data.getXnsd())) { map.put("xnsd", data.getXnsd()); } - if(StringUtils.isNotEmpty(data.getSyjg())) { - if (StringUtils.isNotEmpty(data.getSyjg())){ + if (StringUtils.isNotEmpty(data.getSyjg())) { + if (StringUtils.isNotEmpty(data.getSyjg())) { if (data.getSyjg().equals("yin")) { map.put("syjg", "1"); } @@ -638,8 +766,8 @@ public class ViewFacade { } } } - if(StringUtils.isNotEmpty(data.getHivkt())) { - if (StringUtils.isNotEmpty(data.getHivkt())){ + if (StringUtils.isNotEmpty(data.getHivkt())) { + if (StringUtils.isNotEmpty(data.getHivkt())) { if (data.getHivkt().equals("yin")) { map.put("hivkt", "1"); } @@ -657,23 +785,23 @@ public class ViewFacade { ydqjd = ResolveUtils.replaceYDFMW(ydfmwMap, 2); } - if(StringUtils.isNotEmpty(ydfmw)) { + if (StringUtils.isNotEmpty(ydfmw)) { List ydfmwList = new ArrayList<>(); - if(ydfmw.contains("滴虫")){ + if (ydfmw.contains("滴虫")) { ydfmwList.add("2"); } - if(ydfmw.contains("假丝酵母菌")){ + if (ydfmw.contains("假丝酵母菌")) { ydfmwList.add("3"); } - if(ydfmw.contains("其他")){ + if (ydfmw.contains("其他")) { ydfmwList.add("4"); - ydfmw = ydfmw.replace("滴虫",""); - ydfmw = ydfmw.replace("假丝酵母菌",""); - ydfmw = ydfmw.replace("其他",""); + ydfmw = ydfmw.replace("滴虫", ""); + ydfmw = ydfmw.replace("假丝酵母菌", ""); + ydfmw = ydfmw.replace("其他", ""); ydfmw = ydfmw.replace(",", ""); - map.put("ydfmwOther", ydfmw.substring(ydfmw.indexOf("其他")+2,ydfmw.length())); + map.put("ydfmwOther", ydfmw.substring(ydfmw.indexOf("其他") + 2, ydfmw.length())); } if (CollectionUtils.isEmpty(ydfmwList)) { @@ -683,22 +811,22 @@ public class ViewFacade { map.put("ydfmw", ydfmwList); } - if(StringUtils.isNotEmpty(ydqjd)) { + if (StringUtils.isNotEmpty(ydqjd)) { ydqjd = FunvCommonUtil.getBaseicConfigByid(ydqjd, basicConfigService); - if("Ⅰ度".equals(ydqjd)){ + if ("Ⅰ度".equals(ydqjd)) { map.put("ydqjd", "1"); } - if("Ⅱ度".equals(ydqjd)){ + if ("Ⅱ度".equals(ydqjd)) { map.put("ydqjd", "2"); } - if("Ⅲ度".equals(ydqjd)){ + if ("Ⅲ度".equals(ydqjd)) { map.put("ydqjd", "3"); } - if("Ⅳ度".equals(ydqjd)){ + if ("Ⅳ度".equals(ydqjd)) { map.put("ydqjd", "4"); } } - if(StringUtils.isNotEmpty(data.getbChao())) { + if (StringUtils.isNotEmpty(data.getbChao())) { map.put("bChao", data.getbChao()); } @@ -708,21 +836,21 @@ public class ViewFacade { referralApplyOrderQuery.setParentId(data.getParentId()); referralApplyOrderQuery.setOutHospitalId(hospital); List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); - if(CollectionUtils.isNotEmpty(orderModels)){ + if (CollectionUtils.isNotEmpty(orderModels)) { //转院必要性 if (NumberUtils.isNumber(hospital)) { try { Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(hospital)); if (null != zhuanc1) { - map.put("zhuancl",zhuanc1.getName()); - map.put("isZhuan","2"); + map.put("zhuancl", zhuanc1.getName()); + map.put("isZhuan", "2"); } } catch (Exception e) { } } - }else{ - map.put("isZhuan","1"); + } else { + map.put("isZhuan", "1"); } @@ -732,7 +860,7 @@ public class ViewFacade { int yYear = nextCheck.get(Calendar.YEAR); map.put("sYear", String.valueOf(yYear)); int yMonth = nextCheck.get(Calendar.MONTH); - map.put("sMonth", String.valueOf(yMonth)); + map.put("sMonth", String.valueOf(yMonth + 1)); int yDay = nextCheck.get(Calendar.DAY_OF_MONTH); map.put("sDay", String.valueOf(yDay)); } @@ -1011,11 +1139,11 @@ public class ViewFacade { } if (placenta.getGjkd() != null) { - placetaMap.put("gjkd", placenta.getGjkd()); + placetaMap.put("gjkd", UnitUtils.unitSplice(placenta.getGjkd(), UnitConstants.CM)); } if (placenta.getGjrs() != null) { - placetaMap.put("gjrs", placenta.getGjrs()); + placetaMap.put("gjrs", UnitUtils.unitSplice(placenta.getGjrs(), UnitConstants.BF)); } if (StringUtils.isNotEmpty(placenta.getGjwzOther())) { @@ -1027,7 +1155,7 @@ public class ViewFacade { } if (placenta.getYszs() != null) { - placetaMap.put("yszs", placenta.getYszs()); + placetaMap.put("yszs", UnitUtils.unitSplice(placenta.getYszs(), UnitConstants.CM)); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index bb30782..3c42b47 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -85,19 +85,38 @@ public class AntenatalExaminationResult implements IBasicResultConvert