diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java index 88ddb4a..689f6b4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java @@ -309,14 +309,14 @@ public class BabySieveModel extends BaseModel { map.put("collectHospitalId",collectHospitalId); map.put("currentHospitalId",currentHospitalId); map.put("collectDocterId",collectDocterId); - map.put("collectDate", DateUtil.getYMDH(collectDate)); + map.put("collectDate", DateUtil.getYMDH(collectDate)+":00"); map.put("montherName",montherName); map.put("zyNo",zyNo); map.put("montherCardNo",montherCardNo); map.put("montherDisease",montherDisease); map.put("phone",phone); map.put("address",address); - map.put("babyBirth",DateUtil.getYMDH(babyBirth)); + map.put("babyBirth",DateUtil.getYMDH(babyBirth)+":00"); map.put("babyName",babyName); map.put("dueWeek",dueWeek); map.put("dueType",dueType); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java index 235a4ae..ad103a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java @@ -38,9 +38,9 @@ public class BabySieveController extends BaseController{ @ResponseBody @RequestMapping(value = "/queryBabySieve",method = RequestMethod.GET) public BaseResponse querySieve(@RequestParam(required = false)String cardNo,@RequestParam(required = false)String vcCardNo,HttpServletRequest request) { - //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babySieveFacede.queryBabySieve(cardNo, vcCardNo, 1000000185); - //return babySieveFacede.queryBabySieve(cardNo, vcCardNo, loginState.getId()); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + //return babySieveFacede.queryBabySieve(cardNo, vcCardNo, 1000000185); + return babySieveFacede.queryBabySieve(cardNo, vcCardNo, loginState.getId()); } @@ -53,7 +53,7 @@ public class BabySieveController extends BaseController{ @ResponseBody @RequestMapping(value = "/AddbabySieve",method = RequestMethod.POST) public BaseResponse addOneSieve(@RequestBody @Valid BabySieveAddRequest babySieveAddRequest,HttpServletRequest request) { - //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); //babySieveAddRequest.setId("5b8e296a80edc4ed6f7baa2e"); /* babySieveAddRequest.setTestNumber("试验号"); babySieveAddRequest.setCollectHospitalId("216"); @@ -74,7 +74,7 @@ public class BabySieveController extends BaseController{ babySieveAddRequest.setMatdeliverId("5a4f36f80cf28c02bff7a84f"); babySieveAddRequest.setPatientId("590974c50cf2c06b1d653f5d"); babySieveAddRequest.setCreated("2018-09-04 15:00:15");*/ - return babySieveFacede.addOrUpdateBabySieve(babySieveAddRequest, 1000000185); + return babySieveFacede.addOrUpdateBabySieve(babySieveAddRequest, loginState.getId()); } @@ -115,8 +115,8 @@ public class BabySieveController extends BaseController{ if(StringUtils.isNotEmpty(id)){ String[] ary = id.split(","); for(String item : ary){ - //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - bList.add(babySieveFacede.updateSieveStarts(item,1000000185)); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + bList.add(babySieveFacede.updateSieveStarts(item,loginState.getId())); } return bList; } @@ -135,8 +135,8 @@ public class BabySieveController extends BaseController{ @ResponseBody @RequestMapping(value = "/babySieveLab",method = RequestMethod.GET) public BaseResponse babySieveLab(BabySieveAddRequest babySieveAddRequest,HttpServletRequest request) { - //babySieveAddRequest.setOperatorId(((LoginContext) request.getAttribute("loginContext")).getId()); - babySieveAddRequest.setOperatorId(1000000185); + babySieveAddRequest.setOperatorId(((LoginContext) request.getAttribute("loginContext")).getId()); + //babySieveAddRequest.setOperatorId(1000000185); return babySieveFacede.getBabySieveLab(babySieveAddRequest); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 7f213c9..e427b86 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -17,6 +17,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.BabyScreenAddRequest; import com.lyms.platform.operate.web.request.BabySieveAddRequest; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.BabyModel; @@ -49,6 +50,8 @@ import java.util.Map; public class BabySieveFacede { @Autowired + private BasicConfigService basicConfigService; + @Autowired private AutoMatchFacade autoMatchFacade; @Autowired private PatientsService patientsService; @@ -107,7 +110,14 @@ public class BabySieveFacede { babySieveResult.setCurrentHospitalName(og.getName()); babySieveResult.setRiskFactor(highScoreResult.getHighRisk()); babySieveResult.setRiskScore(highScoreResult.getScoreStr()); + //母亲居住地址 + String jzSheng = CommonsHelper.getName1(pat.getProvinceRegisterId(), basicConfigService); + String jzShi = CommonsHelper.getName1(pat.getCityRegisterId(), basicConfigService); + String jzXian = CommonsHelper.getName1(pat.getAreaRegisterId(), basicConfigService); + String jzXiang = CommonsHelper.getName1(pat.getStreetRegisterId(), basicConfigService); + String jQquan = jzSheng+jzShi+jzXian+jzXiang; babySieveResult.convert(pat); + babySieveResult.setAdress(jQquan); List list = new ArrayList(); for(BabyModel babyModel : models){ if(null == babyModel.getSieveStatus()){//sieveStatus值为空时新生儿为未申请筛查的状态 @@ -120,11 +130,12 @@ public class BabySieveFacede { if(mList != null && mList.size() > 0){ maternalDeliverModel = mList.get(0); } + babySieveResult.setDueWeek(maternalDeliverModel.getDueWeek()); List babies = maternalDeliverModel.getBaby(); for(MaternalDeliverModel.Baby baby : babies){ if(baby.getId() != null && babyModel.getId().equals(baby.getId())){ Date d = DateUtil.parseYMDHM(baby.getDueTime()); - data.setDueDate(DateUtil.getYMDH(d)); + data.setDueDate(DateUtil.getYMDH(d)+":00"); break; } } @@ -319,6 +330,13 @@ public class BabySieveFacede { if(null != patients.getDueDate()){ babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } + //母亲居住地址 + String jzSheng = CommonsHelper.getName1(patients.getProvinceRegisterId(), basicConfigService); + String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService); + String jzXian = CommonsHelper.getName1(patients.getAreaRegisterId(), basicConfigService); + String jzXiang = CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService); + String jQquan = jzSheng+jzShi+jzXian+jzXiang; + babySieveManager.setAdress(jQquan); babySieveManager.setPatientId(patients.getId()); babySieveManager.setCardNo(patients.getCardNo()); babySieveManager.setPhone(patients.getPhone()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java index 5abad2d..434ebdd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java @@ -29,6 +29,9 @@ public class BabySieveManager { //母亲手机号 private String phone; + //母亲居住地址 + private String adress; + //分娩日期 private String birthYMD; @@ -137,6 +140,14 @@ public class BabySieveManager { this.phone = phone; } + public String getAdress() { + return adress; + } + + public void setAdress(String adress) { + this.adress = adress; + } + public List getRiskFactor() { return riskFactor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java index aa66552..e4b07e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java @@ -51,6 +51,8 @@ public class BabySieveResult { private String currentHospitalId; //当前登陆操作医院名称 private String currentHospitalName; + //孕妇居住地址 + private String adress; /***新生儿信息***/ private List data; @@ -208,6 +210,14 @@ public class BabySieveResult { this.lastMenses = lastMenses; } + public String getAdress() { + return adress; + } + + public void setAdress(String adress) { + this.adress = adress; + } + public BabySieveResult convert(Patients pat){ setId(pat.getId()); try { @@ -225,8 +235,8 @@ public class BabySieveResult { setRemarks(pat.getMremark()); setBirth(DateUtil.getyyyy_MM_dd(pat.getBirth())); if (null != pat.getLastMenses()) { - int days = DateUtil.daysBetween(pat.getLastMenses(), new Date()); - this.dueWeek = StringUtils.dueWeek(days); + /*int days = DateUtil.daysBetween(pat.getLastMenses(), new Date()); + this.dueWeek = StringUtils.dueWeek(days);*/ setLastMenses(DateUtil.getyyyy_MM_dd(pat.getLastMenses())); }