diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index d3e1cfe..d78e1df 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -687,6 +687,71 @@ public class BabyCheckModel extends BaseModel { */ private String lhaxisr; + private String sf;//是否失访 + private String sfRea;//失访原因 + private String xb;//胸部 + private String nextSfType;//下次随访类型 + private String fypg;//发育评估 + private Map zyzd; //中医指导 + private String zrks;//转让科室 + + + public String getSf() { + return sf; + } + + public void setSf(String sf) { + this.sf = sf; + } + + public String getSfRea() { + return sfRea; + } + + public void setSfRea(String sfRea) { + this.sfRea = sfRea; + } + + public String getXb() { + return xb; + } + + public void setXb(String xb) { + this.xb = xb; + } + + public String getNextSfType() { + return nextSfType; + } + + public void setNextSfType(String nextSfType) { + this.nextSfType = nextSfType; + } + + public String getFypg() { + return fypg; + } + + public void setFypg(String fypg) { + this.fypg = fypg; + } + + public Map getZyzd() { + return zyzd; + } + + public void setZyzd(Map zyzd) { + this.zyzd = zyzd; + } + + public String getZrks() { + return zrks; + } + + public void setZrks(String zrks) { + this.zrks = zrks; + } + public String getLhdsl() { return lhdsl; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyChinaMedicineModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyChinaMedicineModel.java index 89229cf..6e6bb7d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyChinaMedicineModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyChinaMedicineModel.java @@ -1,8 +1,10 @@ package com.lyms.platform.pojo; +import org.springframework.data.mongodb.core.mapping.Document; + import java.util.Date; import java.util.Map; - +@Document(collection = "lyms_baby_chinamed") public class BabyChinaMedicineModel { private String id; private String babyId; //儿童id diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java index 8812fcc..9fe3b5d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java @@ -5,6 +5,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; import java.util.List; +import java.util.Map; /** * Created by lt on 2017/7/18 0018 @@ -156,6 +157,142 @@ public class NewbornVisit { // 下次访视时间 private Date nextVisitTimeDesc; + private String tlsc; //听力筛查 + private String jbsc; //疾病筛查 + private String xb;//胸部 + private Map zzjy; //转诊建议 + private String orgDept;//机构及科室 + private Map zd; //指导 + private String nextAddr;//下次随访地点 + private String nextSfType;//下次随访类型 + private Integer csWeek;//出生孕周 + private Integer csDay; //出生天 + private String hbqk;// 母亲患病情况 + private String dueOrg;//助产机构名称 + private String csqk;//出生情况 + private String newZx; //新生儿窒息 + private Integer malformation; //畸形 + + public Integer getCsWeek() { + return csWeek; + } + + public void setCsWeek(Integer csWeek) { + this.csWeek = csWeek; + } + + public Integer getCsDay() { + return csDay; + } + + public void setCsDay(Integer csDay) { + this.csDay = csDay; + } + + public String getHbqk() { + return hbqk; + } + + public void setHbqk(String hbqk) { + this.hbqk = hbqk; + } + + public String getDueOrg() { + return dueOrg; + } + + public void setDueOrg(String dueOrg) { + this.dueOrg = dueOrg; + } + + public String getCsqk() { + return csqk; + } + + public void setCsqk(String csqk) { + this.csqk = csqk; + } + + public String getNewZx() { + return newZx; + } + + public void setNewZx(String newZx) { + this.newZx = newZx; + } + + public Integer getMalformation() { + return malformation; + } + + public void setMalformation(Integer malformation) { + this.malformation = malformation; + } + + public String getTlsc() { + return tlsc; + } + + public void setTlsc(String tlsc) { + this.tlsc = tlsc; + } + + public String getJbsc() { + return jbsc; + } + + public void setJbsc(String jbsc) { + this.jbsc = jbsc; + } + + public String getXb() { + return xb; + } + + public void setXb(String xb) { + this.xb = xb; + } + + public Map getZzjy() { + return zzjy; + } + + public void setZzjy(Map zzjy) { + this.zzjy = zzjy; + } + + public String getOrgDept() { + return orgDept; + } + + public void setOrgDept(String orgDept) { + this.orgDept = orgDept; + } + + public Map getZd() { + return zd; + } + + public void setZd(Map zd) { + this.zd = zd; + } + + public String getNextAddr() { + return nextAddr; + } + + public void setNextAddr(String nextAddr) { + this.nextAddr = nextAddr; + } + + public String getNextSfType() { + return nextSfType; + } + + public void setNextSfType(String nextSfType) { + this.nextSfType = nextSfType; + } + public String getBregmaticOther() { return bregmaticOther; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index e886c92..235d9f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -356,8 +356,10 @@ public class BabyCheckController extends BaseController { */ @RequestMapping(value = "/getBaseConfig", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse getBaseConfig() { - return babyCheckFacade.getBaseConfig(); + @TokenRequired + public BaseObjectResponse getBaseConfig(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return babyCheckFacade.getBaseConfig(loginState.getId()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 05a86ff..531bee0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -17,6 +17,7 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.BabyAfterVisitService; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; +import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.dao.master.CouponMapper; @@ -783,6 +784,15 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setLhdsl(request.getLhdsl()); model.setLhdcl(request.getLhdcl()); model.setLhaxisl(request.getLhaxisl()); + + model.setSf(request.getSf()); + model.setSfRea(request.getSfRea()); + model.setXb(request.getXb()); + model.setNextSfType(request.getNextSfType()); + model.setFypg(request.getFypg()); + model.setZyzd(request.getZyzd()); + model.setZrks(request.getZrks()); + return model; } @@ -1998,6 +2008,8 @@ public class BabyCheckFacade extends BaseServiceImpl { }else { base.setQhdHighRiskInfo(null); } + base.setFname(model.getFname()); + base.setHomeAddress(CommonsHelper.getResidence(model.getProvinceId(),model.getCityId(),model.getAreaId(),model.getStreetId(),model.getAddress(),basicConfigService)); } } @@ -2808,6 +2820,14 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setLhdsl(checkModel.getLhdsl()); model.setLhdcl(checkModel.getLhdcl()); model.setLhaxisl(checkModel.getLhaxisl()); + + model.setSf(checkModel.getSf()); + model.setSfRea(checkModel.getSfRea()); + model.setXb(checkModel.getXb()); + model.setNextSfType(checkModel.getNextSfType()); + model.setFypg(checkModel.getFypg()); + model.setZyzd(checkModel.getZyzd()); + model.setZrks(checkModel.getZrks()); return model; } @@ -3108,8 +3128,9 @@ public class BabyCheckFacade extends BaseServiceImpl { return growthEvaluate; } - public BaseObjectResponse getBaseConfig() { + public BaseObjectResponse getBaseConfig(Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); Map map = new HashMap(); //抚养方式 @@ -3124,13 +3145,20 @@ public class BabyCheckFacade extends BaseServiceImpl { List qbType = QbTypeEnums.getQbTypeEnums(); map.put("qbType", qbType); - //月龄套餐 - List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); - map.put("jctc", jctc); + if ("2100001605".equals(hospitalId)) + { + //隆化定制 月龄套餐 + List jctc2 = EnumUtil.toJson(ChildCareEnums.JCTCEnums2.class); + map.put("jctc", jctc2); + } + else + { + //月龄套餐 + List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); + map.put("jctc", jctc); - //隆化定制 月龄套餐 - List jctc2 = EnumUtil.toJson(ChildCareEnums.JCTCEnums2.class); - map.put("jctc", jctc2); + + } List diseases = BabyDiseaseEnums.getBabyDiseaseEnums(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyChinaMedFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyChinaMedFacade.java index 950b3a9..265f6c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyChinaMedFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyChinaMedFacade.java @@ -145,19 +145,29 @@ public class BabyChinaMedFacade { param.mysqlBuild((int) count); query.skip(param.getOffset()).limit(param.getLimit()); List chinaMedicineModels = mongoTemplate.find(query, BabyChinaMedicineModel.class); -// List> results = new LinkedList<>(); -// for (BabyChinaMedicineModel model : chinaMedicineModels) { -// Map result = new HashMap<>(); -// result.put("id",model.getId()); -// result.put("ageType",model.get()); -// result.put("id",model.getId()); -// result.put("id",model.getId()); -// results.add(result); -// } + List> results = new LinkedList<>(); + for (BabyChinaMedicineModel model : chinaMedicineModels) { + Map result = new LinkedHashMap<>(); + BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); + result.put("id",model.getId()); + result.put("babyId",model.getBabyId()); + result.put("babyName",babyModel.getName());//儿童姓名 + result.put("mcertNo",babyModel.getMcertNo());//母亲身份证号 + result.put("mphone",babyModel.getMphone());//母亲手机号 + result.put("ageType",model.getAgeType());//月龄类型 + result.put("checkDate",DateUtil.getyyyy_MM_dd(model.getCheckDate()));//随访时间 + result.put("nextCheckDate",DateUtil.getyyyy_MM_dd(model.getNextCheckDate()));//下次随访时间 + result.put("chinaMed",model.getChinaMed());//中医指导 + result.put("checkDoctor",model.getCheckDoctor());//随访医生 + result.put("addUser",model.getAddUser());//录入人 + result.put("addDate",DateUtil.getyyyy_MM_dd(model.getAddDate()));//录入时间 + result.put("addHospital",model.getAddHospital());//添加机构 + results.add(result); + } BaseListResponse baseListResponse = new BaseListResponse(); - baseListResponse.setData(chinaMedicineModels); + baseListResponse.setData(results); baseListResponse.setPageInfo(param.getPageInfo()); return baseListResponse; } 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 1617938..6426700 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 @@ -5549,6 +5549,7 @@ public class ViewFacade { } result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族 + result.setNationId(model.getNationId() == null ? "" : getBasicConfig(model.getNationId()));//民族 result.setEncoded(model.getEncoded()); result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason())); result.setBabyHighRiskReason(mongoUtil.findNames(model.getBabyHighRiskReason())); @@ -6475,6 +6476,15 @@ public class ViewFacade { model.setLhdsl(checkModel.getLhdsl()); model.setLhdcl(checkModel.getLhdcl()); model.setLhaxisl(checkModel.getLhaxisl()); + + + model.setSf(checkModel.getSf()); + model.setSfRea(checkModel.getSfRea()); + model.setXb(checkModel.getXb()); + model.setNextSfType(checkModel.getNextSfType()); + model.setFypg(checkModel.getFypg()); + model.setZyzd(checkModel.getZyzd()); + model.setZrks(checkModel.getZrks()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index fc1a8fe..7ec002a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -646,6 +646,70 @@ public class BabyCheckRequest { */ private String lhaxisr; + private String sf;//是否失访 + private String sfRea;//失访原因 + private String xb;//胸部 + private String nextSfType;//下次随访类型 + private String fypg;//发育评估 + private Map zyzd; //中医指导 + private String zrks;//转让科室 + + public String getSf() { + return sf; + } + + public void setSf(String sf) { + this.sf = sf; + } + + public String getSfRea() { + return sfRea; + } + + public void setSfRea(String sfRea) { + this.sfRea = sfRea; + } + + public String getXb() { + return xb; + } + + public void setXb(String xb) { + this.xb = xb; + } + + public String getNextSfType() { + return nextSfType; + } + + public void setNextSfType(String nextSfType) { + this.nextSfType = nextSfType; + } + + public String getFypg() { + return fypg; + } + + public void setFypg(String fypg) { + this.fypg = fypg; + } + + public Map getZyzd() { + return zyzd; + } + + public void setZyzd(Map zyzd) { + this.zyzd = zyzd; + } + + public String getZrks() { + return zrks; + } + + public void setZrks(String zrks) { + this.zrks = zrks; + } + public String getLhdsl() { return lhdsl; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index df12fa6..6f82fe7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -144,7 +144,24 @@ public class BabyBasicResult { //胆红素 腹 private String bilirubinBelly; + private String homeAddress; //家庭地址 + private String fname; //父亲姓名 + public String getHomeAddress() { + return homeAddress; + } + + public void setHomeAddress(String homeAddress) { + this.homeAddress = homeAddress; + } + + public String getFname() { + return fname; + } + + public void setFname(String fname) { + this.fname = fname; + } public String getBilirubinBelly() { return bilirubinBelly; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index faf17a8..9ba4ecf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -39,6 +39,70 @@ public class BabyCheckPageResult { private String xlsqxw;// 社区行为(心理月龄) private String diagnoseNLS; //能力商诊断 + private String sf;//是否失访 + private String sfRea;//失访原因 + private String xb;//胸部 + private String nextSfType;//下次随访类型 + private String fypg;//发育评估 + private Map zyzd; //中医指导 + private String zrks;//转让科室 + + public String getSf() { + return sf; + } + + public void setSf(String sf) { + this.sf = sf; + } + + public String getSfRea() { + return sfRea; + } + + public void setSfRea(String sfRea) { + this.sfRea = sfRea; + } + + public String getXb() { + return xb; + } + + public void setXb(String xb) { + this.xb = xb; + } + + public String getNextSfType() { + return nextSfType; + } + + public void setNextSfType(String nextSfType) { + this.nextSfType = nextSfType; + } + + public String getFypg() { + return fypg; + } + + public void setFypg(String fypg) { + this.fypg = fypg; + } + + public Map getZyzd() { + return zyzd; + } + + public void setZyzd(Map zyzd) { + this.zyzd = zyzd; + } + + public String getZrks() { + return zrks; + } + + public void setZrks(String zrks) { + this.zrks = zrks; + } + public String getDiagnoseNLS() { return diagnoseNLS; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 94ea216..28dc9e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -888,6 +888,71 @@ public class BabyCheckResult { */ private String lhaxisr; + + private String sf;//是否失访 + private String sfRea;//失访原因 + private String xb;//胸部 + private String nextSfType;//下次随访类型 + private String fypg;//发育评估 + private Map zyzd; //中医指导 + private String zrks;//转让科室 + + public String getSf() { + return sf; + } + + public void setSf(String sf) { + this.sf = sf; + } + + public String getSfRea() { + return sfRea; + } + + public void setSfRea(String sfRea) { + this.sfRea = sfRea; + } + + public String getXb() { + return xb; + } + + public void setXb(String xb) { + this.xb = xb; + } + + public String getNextSfType() { + return nextSfType; + } + + public void setNextSfType(String nextSfType) { + this.nextSfType = nextSfType; + } + + public String getFypg() { + return fypg; + } + + public void setFypg(String fypg) { + this.fypg = fypg; + } + + public Map getZyzd() { + return zyzd; + } + + public void setZyzd(Map zyzd) { + this.zyzd = zyzd; + } + + public String getZrks() { + return zrks; + } + + public void setZrks(String zrks) { + this.zrks = zrks; + } + public String getLhdsl() { return lhdsl; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index 46579cd..2317ec3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -349,6 +349,24 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit NewbornVisit newbornVisit = mongoTemplate.findById(id, NewbornVisit.class); if(newbornVisit != null) { Map restMap = new HashMap<>(); + + restMap.put("tlsc",newbornVisit.getTlsc()); + restMap.put("jbsc",newbornVisit.getJbsc()); + restMap.put("xb",newbornVisit.getXb()); + restMap.put("zzjy",newbornVisit.getZzjy()); + restMap.put("orgDept",newbornVisit.getOrgDept()); + restMap.put("zd",newbornVisit.getZd()); + restMap.put("nextAddr",newbornVisit.getNextAddr()); + restMap.put("nextSfType",newbornVisit.getNextSfType()); + + restMap.put("csWeek",newbornVisit.getCsWeek()); + restMap.put("csDay",newbornVisit.getCsDay()); + restMap.put("hbqk",newbornVisit.getHbqk()); + restMap.put("dueOrg",newbornVisit.getDueOrg()); + restMap.put("csqk",newbornVisit.getCsqk()); + restMap.put("newZx",newbornVisit.getNewZx()); + restMap.put("malformation",newbornVisit.getMalformation()); + restMap.put("id", newbornVisit.getId()); /** id */ /**