From 40bd32f5f755b647e841d8a03804b71753e4fff2 Mon Sep 17 00:00:00 2001 From: xujiahong Date: Thu, 4 May 2017 17:52:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E6=A8=A1=E5=9D=97-=E6=97=A5?= =?UTF-8?q?=E5=B8=B8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/hospital/entity/assist/DiagnoseAssit.java | 6 + .../hospital/entity/diagnose/DiagnoseInfo.java | 27 +++++ .../hospital/entity/history/HistorySource.java | 15 +++ .../diagnose/impl/DiagnoseInfoServiceImpl.java | 5 +- .../diagnose/impl/DiagnoseTaiServiceImpl.java | 4 +- .../history/impl/HistoryMapsServiceImpl.java | 6 +- .../history/impl/HistorySourceServiceImpl.java | 9 ++ .../controller/woman/WomanExamController.java | 134 ++++++++++++++++++--- .../request/exam/ExamAddRequestWrapper.java | 81 ++++++++++--- .../hospital/response/keymap/WomanExamKeymap.java | 4 +- .../com/lyms/hospital/util/trans/XjhMapUtil.java | 2 +- 11 files changed, 249 insertions(+), 44 deletions(-) diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java index 6479c00..abed328 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java @@ -30,6 +30,12 @@ public class DiagnoseAssit implements Serializable { * 诊断类型：1婚前检查，2产检，【3儿保检查】 */ public static final int DIAGNOSE_TYPE_CHILD = 3; + + //常见数值： +,±,- + public static final int YIN = 1; + public static final int RUOYANG = 2; + public static final int YANG = 3; + /** * （辅助检查） diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java index 4d19bc6..d5a1565 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java @@ -19,6 +19,10 @@ import com.baomidou.mybatisplus.annotations.TableName; public class DiagnoseInfo implements Serializable { private static final long serialVersionUID = 1L; + + //诊断类型，0为初诊，1为复诊 + public static final int TYPE_FIRST = 1; + public static final int TYPE_SECOND = 2; /** * @@ -249,6 +253,13 @@ public class DiagnoseInfo implements Serializable { @TableField(value = "HAS_DIAGNOSE") private Integer hasDiagnose; + + + //格式化字段====================== + @TableField(exist = false) + private String diagnoseTimeStr; + @TableField(exist = false) + private String nextinspectTimeStr; public String getId() { return id; @@ -609,6 +620,22 @@ public class DiagnoseInfo implements Serializable { public void setHasDiagnose(Integer hasDiagnose) { this.hasDiagnose = hasDiagnose; } + + public String getDiagnoseTimeStr() { + return diagnoseTimeStr; + } + + public void setDiagnoseTimeStr(String diagnoseTimeStr) { + this.diagnoseTimeStr = diagnoseTimeStr; + } + + public String getNextinspectTimeStr() { + return nextinspectTimeStr; + } + + public void setNextinspectTimeStr(String nextinspectTimeStr) { + this.nextinspectTimeStr = nextinspectTimeStr; + } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java index 8437c0e..84531a8 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java @@ -61,6 +61,12 @@ public class HistorySource implements Serializable { */ @TableField(value = "HAS_TEXT") private Integer hasText; + + /** + * 一级节点是否需要换行（应前端要求，加的条件判断字段） + */ + @TableField(exist = false) + private boolean needNewLine; /** * 子级别元素 @@ -140,4 +146,13 @@ public class HistorySource implements Serializable { this.children = children; } + public boolean isNeedNewLine() { + return needNewLine; + } + + public void setNeedNewLine(boolean needNewLine) { + this.needNewLine = needNewLine; + } + + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java index e64c79d..4b021d7 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java @@ -92,7 +92,7 @@ public class DiagnoseInfoServiceImpl extends ServiceImpl ew = new EntityWrapper(); - ew.where("type={0}", type).and("BASE_PAPERS_NUMBER={0}", cardNum).orderBy("DIAGNOSE_TIME", Boolean.FALSE); + ew.where("TYPE={0}", type).and("BASE_PAPERS_NUMBER={0}", cardNum).orderBy("DIAGNOSE_TIME", Boolean.FALSE); return (DiagnoseInfo) selectObj(ew); } @@ -108,7 +108,7 @@ public class DiagnoseInfoServiceImpl extends ServiceImpl findListByPid(String pid) { EntityWrapper ew = new EntityWrapper(); - ew.where("pid={0}", pid); + ew.where("PID={0}", pid); return selectList(ew); } @@ -129,6 +129,7 @@ public class DiagnoseInfoServiceImpl extends ServiceImpl wrapper = new EntityWrapper(); - wrapper.where("examId = {0}", examId); + wrapper.where("EXAM_ID = {0}", examId); delete(wrapper); //insert Date now = new Date(); @@ -54,7 +54,7 @@ public class DiagnoseTaiServiceImpl extends ServiceImpl getListByExamId(String examId) { EntityWrapper wrapper = new EntityWrapper(); - wrapper.where("examId = {0}", examId); + wrapper.where("EXAM_ID = {0}", examId); return this.selectList(wrapper); } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistoryMapsServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistoryMapsServiceImpl.java index 18c18ed..d3c8bcd 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistoryMapsServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistoryMapsServiceImpl.java @@ -19,6 +19,7 @@ import com.lyms.hospital.service.diagnose.DiagnoseInfoService; import com.lyms.hospital.service.history.HistoryMapsService; import com.lyms.hospital.service.woman.WomanFetationRecordService; import com.lyms.hospital.service.woman.WomanRecordService; +import com.lyms.util.StrUtils; /** *

@@ -71,10 +72,11 @@ public class HistoryMapsServiceImpl extends ServiceImpl().where("targetId={0}", targetId).and("targetType={0}", targetType)); + delete(new EntityWrapper().where("TARGET_ID={0}", targetId).and("TARGET_TYPE={0}", targetType)); //insert for(int i=0;i getListByTarget(String targetId, Integer targetType) { EntityWrapper ew = new EntityWrapper(); - ew.where("targetId={0}", targetId).and("targetType={0}", targetType); + ew.where("TARGET_ID={0}", targetId).and("TARGET_TYPE={0}", targetType); return this.selectList(ew); } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java index bfe35c8..c98a349 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java @@ -7,6 +7,8 @@ import com.lyms.util.InstanceUtils; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + import java.io.Serializable; import java.util.List; import java.util.Map; @@ -47,6 +49,13 @@ public class HistorySourceServiceImpl extends ServiceImpl level2Data = InstanceUtils.newHashMap(); for(HistorySource historySource : dbdataList){ if("1".equals(historySource.getLevel())){ + //========处理needNewLine字段========== + if(!StringUtils.isEmpty(historySource.getName()) && historySource.getName().contains("
")){ + historySource.setNeedNewLine(true); + }else{ + historySource.setNeedNewLine(false); + } + //========处理needNewLine字段========== firstdataList.add(historySource);//最终只返回一级列表，其他层级以子类形式返回 firstLevelData.put(historySource.getId(), historySource);//一级对象 } diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java index bafcdaf..66267ce 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java @@ -30,6 +30,7 @@ import com.lyms.hospital.service.assist.DiagnoseAssitService; import com.lyms.hospital.service.diagnose.DiagnoseInfoService; import com.lyms.hospital.service.diagnose.DiagnoseTaiService; import com.lyms.hospital.service.history.HistoryMapsService; +import com.lyms.hospital.service.token.TokenService; import com.lyms.hospital.service.woman.WomanFetationRecordService; import com.lyms.hospital.util.HospitalUtil; import com.lyms.util.DateUtil; @@ -62,6 +63,8 @@ public class WomanExamController extends BaseController { private DiagnoseTaiService diagnoseTaiService; @Autowired private HistoryMapsService historyMapsService; + @Autowired + private TokenService tokenService; /** *

  • @Description:产检获取字典数据 @@ -71,6 +74,7 @@ public class WomanExamController extends BaseController { *
  • 修改人： *
  • 修改时间： */ + @SuppressWarnings("serial") @RequestMapping(value = "/antex/getenums", method = RequestMethod.GET) @ResponseBody public AjaxResult getDictionary() { @@ -89,18 +93,108 @@ public class WomanExamController extends BaseController { //getFetPosition data.put("getFetPosition", FetalPositionEnums.getList()); //字典常量======================================= - //xx 血型 - data.put("xx", null); - //getHighRisk 高危标签 - data.put("", null); - //gwfz 高危分值（高危等级-->评分） - data.put("", null); - //ydqjd 阴道清洁度 - data.put("", null); - //organizations 组织机构 - data.put("", null); - //fxys 风险颜色 - data.put("", null); + //xx 血型-模拟数据 TODO + List> xx = new ArrayList<>(); + Map xx_map1 = new HashMap(){{ + put("id", "xxa"); + put("parentId", "5769eef90cf22c315757741f"); + put("name", "A"); + }}; + xx.add(xx_map1); + Map xx_map2 = new HashMap(){{ + put("id", "xxb"); + put("parentId", "5769eef90cf22c315757741f"); + put("name", "B"); + }}; + xx.add(xx_map2); + data.put("xx", xx); + + //getHighRisk 高危标签-模拟数据 TODO + List> getHighRisk = new ArrayList<>(); + Map getHighRisk_map1 = new HashMap(){{ + put("id", "meidu"); + put("parentId", "224b2329-cb82-4da3-a071-8527f8283aab"); + put("code", "10"); + put("name", "梅毒"); + put("typeId","fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + put("color","risk_purple"); + put("yn","1"); + }}; + getHighRisk.add(getHighRisk_map1); + Map getHighRisk_map2 = new HashMap(){{ + put("id", "hiv"); + put("parentId", "224b2329-cb82-4da3-a071-8527f8283aab"); + put("code", "10"); + put("name", "HIV"); + put("typeId","fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + put("color","risk_purple"); + put("yn","1"); + }}; + getHighRisk.add(getHighRisk_map2); + data.put("getHighRisk", getHighRisk); + + //gwfz 高危分值（高危等级-->评分）-模拟数据 TODO + List> gwfz = new ArrayList<>(); + Map gwfz_map1 = new HashMap(){{ + put("id", "5769f0640cf2d37f034793a2"); + put("parentId", "5769eef90cf22c3157577422"); + put("name", "5"); + }}; + gwfz.add(gwfz_map1); + Map gwfz_map2 = new HashMap(){{ + put("id", "5769f0640cf2d37f034793a3"); + put("parentId", "5769eef90cf22c3157577422"); + put("name", "10"); + }}; + gwfz.add(gwfz_map2); + data.put("gwfz", gwfz); + + //ydqjd 阴道清洁度-模拟数据 TODO + List> ydqjd = new ArrayList<>(); + Map ydqjd_map1 = new HashMap(){{ + put("id", "5769ef930cf2d37f03479387"); + put("parentId", "5769eef90cf22c3157577420"); + put("name", "Ⅰ度"); + }}; + ydqjd.add(ydqjd_map1); + Map ydqjd_map2 = new HashMap(){{ + put("id", "5769ef930cf2d37f03479390"); + put("parentId", "5769eef90cf22c3157577420"); + put("name", "Ⅱ度"); + }}; + ydqjd.add(ydqjd_map2); + data.put("ydqjd", ydqjd); + + //organizations 组织机构-模拟数据 TODO + List> organizations = new ArrayList<>(); + Map organizations_map1 = new HashMap(){{ + put("id", "193"); + put("name", "青龙妇幼保健院"); + }}; + organizations.add(organizations_map1); + Map organizations_map2 = new HashMap(){{ + put("id", "195"); + put("name", "昌黎妇幼保健院"); + }}; + organizations.add(organizations_map2); + data.put("organizations", organizations); + + //fxys 风险颜色-模拟数据 TODO + List> fxys = new ArrayList<>(); + Map fxys_map1 = new HashMap(){{ + put("id", "zsyj"); + put("parentId", "fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + put("name", "紫色预警"); + }}; + fxys.add(fxys_map1); + Map fxys_map2 = new HashMap(){{ + put("id", "csyj"); + put("parentId", "fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + put("name", "橙色预警"); + }}; + fxys.add(fxys_map2); + data.put("fxys", fxys); + //cTime data.put("cTime", DateUtil.getyyyy_MM_dd(new Date())); //now @@ -133,6 +227,7 @@ public class WomanExamController extends BaseController { List historyList = historyMapsService.getListByTarget(info.getId(), HistoryMaps.TARGET_TYPE_EXAM);// 关联目标类型：1产检、2妇女建档 List taiList = diagnoseTaiService.getListByExamId(info.getId()); + return AjaxResult.returnFail(); } @@ -149,6 +244,10 @@ public class WomanExamController extends BaseController { @ResponseBody public AjaxResult saveFirstExam(@RequestBody ExamAddRequest request) { /* + * 同一产程不能新增两次初诊：（如果条件是新增，根据孕妇档案ID WOMAN_ID 查询产检记录列表） TODO + */ + // + /* * （1）保存产检基本信息 （2）保存辅助检查信息 （3）批量保存病史信息（4）多个胎儿信息（5） 多个诊断信息 TODO */ // 对象转换 @@ -174,15 +273,16 @@ public class WomanExamController extends BaseController { */ @RequestMapping(value = "/antexmanage", method = RequestMethod.GET) @ResponseBody - public AjaxResult selectExamHistory(String cardNo, String vcCardNo, String orgId) {// orgId或来自token + public AjaxResult selectExamHistory(String cardNo, String vcCardNo) { /* * （1）孕妇档案信息（通过证件号或就诊卡号查询）-根据产检券查询 TODO （2）高危因素列表 TODO （3）产检记录列表 TODO * */ // 基本验证 - if (StringUtils.isEmpty(orgId)) { - return AjaxResult.returnFail("入参错误：医院ID为空"); - } + String orgId = "1";// orgId或来自token +// if (StringUtils.isEmpty(orgId)) { +// return AjaxResult.returnFail("入参错误：医院ID为空"); +// } if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo)) { return AjaxResult.returnFail("入参错误：查询条件为空"); } @@ -204,7 +304,7 @@ public class WomanExamController extends BaseController { } // 未查询到孕妇建档信息 if (dbFetationRecord == null) { - return AjaxResult.returnFail("未查询到孕妇建档信息"); + return AjaxResult.returnSuccess(null);//将基本的对象返回空 } // （2）高危因素列表 TODO List> riskFactor = new ArrayList<>(); diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequestWrapper.java b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequestWrapper.java index 10c01b9..d44c0ba 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequestWrapper.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequestWrapper.java @@ -1,5 +1,6 @@ package com.lyms.hospital.request.exam; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -28,13 +29,30 @@ public class ExamAddRequestWrapper { /** * 病史列表信息 */ - private List historyMapsList; + private List historyMapsList = new ArrayList<>(); /** * 胎儿列表信息 */ - private List diagnoseTaiList; + private List diagnoseTaiList = new ArrayList<>(); - public ExamAddRequestWrapper() { + public ExamAddRequestWrapper(DiagnoseInfo info,DiagnoseAssit assist, + List historyMapsList,List diagnoseTaiList) { + this.diagnoseInfo = info; + this.diagnoseAssit = assist; + this.historyMapsList = historyMapsList; + this.diagnoseTaiList = diagnoseTaiList; + + Map infoMap = XjhMapUtil.transBean2FormatAliasMap(info, + XjhMapUtil.getKeyMap(WomanExamKeymap.original, WomanExamKeymap.alias)); + Map assistMap = XjhMapUtil.transBean2FormatAliasMap(assist, + XjhMapUtil.getKeyMap(WomanExamKeymap.original, WomanExamKeymap.alias)); + infoMap.putAll(assistMap); + this.examAddRequest = (ExamAddRequest) XjhMapUtil.transMap2AliasBean(infoMap, new ExamAddRequest(), + XjhMapUtil.getKeyMap(WomanExamKeymap.original, WomanExamKeymap.alias)); + } + + public ExamAddRequestWrapper(){ + } @SuppressWarnings("unchecked") @@ -48,7 +66,8 @@ public class ExamAddRequestWrapper { XjhMapUtil.getKeyMap(WomanExamKeymap.original, WomanExamKeymap.alias)); diagnoseInfo = (DiagnoseInfo) XjhMapUtil.transMap2FormatBean(infoMap, new DiagnoseInfo()); diagnoseInfo.setWomanId(request.getParentId());// 孕妇档案ID - diagnoseInfo.setPersonId(request.getPid());// 女性居民ID + diagnoseInfo.setPersonId(request.getPid());// 女性居民 + diagnoseInfo.setOrgId(null);// 医院ID TODO 来自于token 登录信息 // 血压 Map bp = request.getBp(); if (bp != null) { @@ -62,11 +81,33 @@ public class ExamAddRequestWrapper { */ Map assistMap = XjhMapUtil.transBean2FormatAliasMap(request, XjhMapUtil.getKeyMap(DiagnoseAssistKeymap.original, DiagnoseAssistKeymap.alias)); + // 处理辅助检查，将老版本的"yin","ruoyang","yang"字符串覆盖为数字保存 + if (assistMap != null && !assistMap.isEmpty()) { + for (String key : assistMap.keySet()) { + String str = this.obj2Str(assistMap.get(key)); + if ("yin".equals(str)) { + assistMap.put(key, DiagnoseAssit.YIN + ""); + } else if ("yang".equals(str)) { + assistMap.put(key, DiagnoseAssit.YANG + ""); + } else if ("ruoyang".equals(str)) { + assistMap.put(key, DiagnoseAssit.RUOYANG + ""); + } + } + } diagnoseAssit = (DiagnoseAssit) XjhMapUtil.transMap2FormatBean(assistMap, new DiagnoseAssit()); // 其他老版本结构数据补录 // 阴道分泌物 Map ydfmw = request.getYdfmw(); if (ydfmw != null) { + // 老版本布尔类型，转变为 int 值 + for (String key : ydfmw.keySet()) { + String str = this.obj2Str(ydfmw.get(key)); + if ("true".equals(str)) { + ydfmw.put(key, 1); + } else if ("false".equals(str)) { + ydfmw.put(key, 0); + } + } String[] original = { "ydqjd", "dc", "jsjmj", "qt", "qtText" }; String[] alias = { "vaginaYdqjd", "vaginaDc", "vaginaJsjmj", "vaginaOther", "vaginaOtherTxt" }; diagnoseAssit = (DiagnoseAssit) XjhMapUtil.transMap2AliasBean(ydfmw, diagnoseAssit, @@ -81,8 +122,8 @@ public class ExamAddRequestWrapper { Map map1 = (Map) historyInfo.get(key1);// 1级节点 if (map1 != null) { // 处理1级节点 - String node1_yesOrNo = map1.get("yesOrNo").toString(); - String node1_id = map1.get("id").toString(); + String node1_yesOrNo = this.obj2Str(map1.get("yesOrNo")); + String node1_id = this.obj2Str(map1.get("id")); if ("yes".equals(node1_yesOrNo)) { historyMapsList.add(new HistoryMaps(node1_id, null)); } @@ -115,24 +156,24 @@ public class ExamAddRequestWrapper { } } } // 病史信息 end - //hHealthInfo 丈夫健康情况（特殊处理） - Map hHealthInfo = request.gethHealthInfo(); - if(hHealthInfo!=null){ - if("yes".equals(hHealthInfo.get("yesOrNo").toString())){ - historyMapsList.add(new HistoryMaps(HistoryMaps.ZFJKQK, hHealthInfo.get("qt").toString())); + // hHealthInfo 丈夫健康情况（特殊处理） + Map hHealthInfo = request.gethHealthInfo(); + if (hHealthInfo != null) { + if ("yes".equals(this.obj2Str(hHealthInfo.get("yesOrNo")))) { + historyMapsList.add(new HistoryMaps(HistoryMaps.ZFJKQK, this.obj2Str(hHealthInfo.get("qt")))); } } /* * 胎儿信息 */ - List> placentas = request.getPlacentas(); - if(placentas!=null && !placentas.isEmpty()){ - for(Map map : placentas){ + List> placentas = request.getPlacentas(); + if (placentas != null && !placentas.isEmpty()) { + for (Map map : placentas) { DiagnoseTai tai = new DiagnoseTai(); - tai.setHeartRate(map.get("heartRate").toString()); - tai.setPosition(map.get("fetalPosition").toString()); - tai.setFirstExpose(map.get("fetalPresentation").toString()); - tai.setIsLink(Integer.parseInt(map.get("join").toString())); + tai.setHeartRate(this.obj2Str(map.get("heartRate"))); + tai.setPosition(this.obj2Str(map.get("fetalPosition"))); + tai.setFirstExpose(this.obj2Str(map.get("fetalPresentation"))); + tai.setIsLink(map.get("join") == null ? null : Integer.parseInt(map.get("join").toString())); diagnoseTaiList.add(tai); } } @@ -142,6 +183,10 @@ public class ExamAddRequestWrapper { } } + private String obj2Str(Object obj) { + return obj == null ? null : obj.toString(); + } + // getter and setter public ExamAddRequest getExamAddRequest() { return examAddRequest; diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java b/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java index d00b0a7..d429f8c 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java @@ -36,8 +36,8 @@ public class WomanExamKeymap { //基础信息字段（4） "doctorId",//医生ID - "diagnoseTime",//产检时间 - "nextinspectTime",//下次检查日期 + "diagnoseTimeStr",//产检时间 + "nextinspectTimeStr",//下次检查日期 "nextinspectNum",//下次产检孕周数 //孕产史（11） diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java b/parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java index b7c8c7a..63ec275 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java @@ -121,7 +121,7 @@ public class XjhMapUtil { */ if (keyType.equals(String.class) && key.length() > 3 && "Str".equals(key.substring(key.length() - 3))) {// key可能是格式化字段 - String dateKey = key.substring(key.length() - 3); + String dateKey = key.substring(0,key.length() - 3); for (PropertyDescriptor dateProperty : propertyDescriptors) { if (dateKey.equals(dateProperty.getName())) {// 找到了对应的日期字段，set之 String dateValue = value.toString(); -- 1.8.3.1