jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e0b2de9ff9d9b04252376ea2dbc7d1556ee3c513

Authored by cfl
1 parent bf0df874c0
Exists in master and in 2 other branches dev, luanping

修改产检录入增加高危因素名称

Showing 2 changed files with 22 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java View file @ e0b2de9
... ... @@ -523,9 +523,10 @@
523 523 @RequestParam(value = "doctorId", required = false) String doctorId,
524 524 @RequestParam(value = "sieveType", required = false) String sieveType,
525 525 @RequestParam(value = "edema", required = false) String edema,
526   - @RequestParam(value = "riskFactor", required = false) String riskFactor
  526 + @RequestParam(value = "riskFactor", required = false) String riskFactor,
  527 + @RequestParam(value = "riskFactorName", required = false) String riskFactorName
527 528 ) {
528   - return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr,edema, pid, hospitalId, nextTime, doctorId,sieveType,riskFactor);
  529 + return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr,edema, pid, hospitalId, nextTime, doctorId,sieveType,riskFactor,riskFactorName);
529 530 }
530 531  
531 532 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ e0b2de9
... ... @@ -1760,7 +1760,7 @@
1760 1760 */
1761 1761 public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid,
1762 1762 String hospitalId, String nextTime, String doctorId,String sieveType,
1763   - String riskFactor) {
  1763 + String riskFactor,String riskFactorName) {
1764 1764 WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel();
1765 1765 boolean falg = true;
1766 1766 List<String> fhrList = new ArrayList<>();
... ... @@ -1992,6 +1992,10 @@
1992 1992 yumInfosMap.put("edema", edema);
1993 1993 yumInfosMap.put("nextTime", nextTime);
1994 1994 yumInfosMap.put("sieveType", sieveType);
  1995 + yumInfosMap.put("hospitalId",hospitalId);
  1996 + yumInfosMap.put("doctorId",doctorId);
  1997 + yumInfosMap.put("riskFactor",riskFactor);
  1998 + yumInfosMap.put("riskFactorName",riskFactorName);
1995 1999 WxMeasureInfoModel wxMeasure = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("1")), WxMeasureInfoModel.class);
1996 2000 if (null == wxMeasure) {
1997 2001 listMap.add(yumInfosMap);
... ... @@ -2029,6 +2033,20 @@
2029 2033 if (null == yumInfosMap.get("edema") || "" == yumInfosMap.get("edema")) {
2030 2034 yumInfosMap.put("edema", map.get("edema"));
2031 2035 }
  2036 +
  2037 + if (null == yumInfosMap.get("hospitalId") || "" == yumInfosMap.get("hospitalId")) {
  2038 + yumInfosMap.put("hospitalId", map.get("hospitalId"));
  2039 + }
  2040 + if (null == yumInfosMap.get("doctorId") || "" == yumInfosMap.get("doctorId")) {
  2041 + yumInfosMap.put("doctorId", map.get("doctorId"));
  2042 + }
  2043 + if (null == yumInfosMap.get("riskFactor") || "" == yumInfosMap.get("riskFactor")) {
  2044 + yumInfosMap.put("riskFactor", map.get("riskFactor"));
  2045 + }
  2046 + if (null == yumInfosMap.get("riskFactorName") || "" == yumInfosMap.get("riskFactorName")) {
  2047 + yumInfosMap.put("riskFactorName", map.get("riskFactorName"));
  2048 + }
  2049 +
2032 2050 if (null == yumInfosMap.get("nextTime") || "" == yumInfosMap.get("nextTime")) {
2033 2051 yumInfosMap.put("nextTime", map.get("nextTime"));
2034 2052 }