jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 68 additions and 1 deletions

...	...	@@ -324,6 +324,21 @@
324	324	}
325	325
326	326	/**
	327	+ * 查询符合条件的儿童
	328	+ * 判断是否已有儿童中
	329	+ * 母亲手机号、儿童出生日期、性别，满足这三项重复提示：
	330	+ * @return
	331	+ */
	332	+ @RequestMapping(value = "/queryBabyListDate", method = RequestMethod.GET)
	333	+ @ResponseBody
	334	+ @TokenRequired
	335	+ public BaseListResponse queryBabyListDate( @RequestParam(value = "mphone", required = true) String mphone,
	336	+ @RequestParam(value = "birth", required = true) String birth,
	337	+ @RequestParam(value = "sex", required = true) Integer sex ) {
	338	+ return babyBookbuildingFacade.queryBabyListDate(mphone,birth,sex);
	339	+ }
	340	+
	341	+ /**
327	342	* 修改儿童档案结案状态
328	343	* @param babyManageRequest
329	344	* @param httpServletRequest

...	...	@@ -3179,6 +3179,37 @@
3179	3179	}
3180	3180
3181	3181	/**
	3182	+ *查询符合条件的儿童
	3183	+ * 判断是否已有儿童中
	3184	+ * 母亲手机号、儿童出生日期、性别，满足这三项重复提示：
	3185	+ * @Author: 武涛涛
	3186	+ * @Date: 2020/12/16 17:23
	3187	+ */
	3188	+ public BaseListResponse queryBabyListDate(String mphone,String birth,Integer sex ) {
	3189	+ BaseListResponse br = new BaseListResponse();
	3190	+
	3191	+ BabyModelQuery babyQuery = new BabyModelQuery();
	3192	+ List buildType = new ArrayList();
	3193	+ buildType.add(1);//儿童直接建档
	3194	+ buildType.add(2);//产妇分娩建档
	3195	+ babyQuery.setBuildTypeList(buildType);
	3196	+ babyQuery.setDataStatus(true);//排除自动建档数据
	3197	+ babyQuery.setYn(YnEnums.YES.getId());
	3198	+
	3199	+ babyQuery.setMphone(mphone);
	3200	+ if(StringUtils.isNotEmpty(birth)){
	3201	+ babyQuery.setBirthStart(DateUtil.parseYMD(birth));
	3202	+ babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(birth).getTime() + 24 * 60 * 60 * 1000 - 1));
	3203	+ }
	3204	+ babyQuery.setSex(sex);
	3205	+ List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
	3206	+ br.setData(models);
	3207	+ br.setErrorcode(ErrorCodeConstants.SUCCESS);
	3208	+ br.setErrormsg("成功");
	3209	+ return br;
	3210	+ }
	3211	+
	3212	+ /**
3182	3213	* 生成儿童指导短信
3183	3214	*
3184	3215	* @param request

...	...	@@ -1710,6 +1710,8 @@
1710	1710	archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService);
1711	1711	checkupResult.setLiveAddress(liveAddress);
1712	1712	checkupResult.setPhone(archiveModel.getPhone());
	1713	+ checkupResult.setJczt(result.getJczt());
	1714	+ checkupResult.setFkjjState(result.getFkjjState());
1713	1715
1714	1716	checkupResult.setSpouseName(result.getSpouseName());
1715	1717	checkupResult.setSpouseCertificateType(getBaseicConfigByid(result.getSpouseCertificateTypeId()));

...	...	@@ -45,7 +45,10 @@
45	45	//联系方式
46	46	private String phone;
47	47
48		-
	48	+ // 1妇科检查，男性检查拒绝，2不拒绝
	49	+ private String jczt;
	50	+ //加上绝经 1否 2 是
	51	+ private String fkjjState;
49	52	/**配偶信息 */
50	53	//配偶姓名
51	54	private String spouseName;
...	...	@@ -471,6 +474,22 @@
471	474
472	475	public void setGaoWanZuo(String gaoWanZuo) {
473	476	this.gaoWanZuo = gaoWanZuo;
	477	+ }
	478	+
	479	+ public String getJczt() {
	480	+ return jczt;
	481	+ }
	482	+
	483	+ public void setJczt(String jczt) {
	484	+ this.jczt = jczt;
	485	+ }
	486	+
	487	+ public String getFkjjState() {
	488	+ return fkjjState;
	489	+ }
	490	+
	491	+ public void setFkjjState(String fkjjState) {
	492	+ this.fkjjState = fkjjState;
474	493	}
475	494
476	495	public String getGaoWanYou() {