jiangjiazhi / regional-platform

Commit 29feef838c5e2e033b054856d36b812eef8f345f

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 43 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java

...	...	@@ -311,6 +311,16 @@
311	311	*/
312	312	public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest, Integer userId) {
313	313	String hospitalId = autoMatchFacade.getHospitalId(userId);
	314	+
	315	+ //秦皇岛市山海关人民医院零时处理
	316	+ if (StringUtils.isNotEmpty(antExAddRequest.getCheckDate()) && "1000000004".equals(hospitalId)) {
	317	+ if (!antExAddRequest.getCheckDate().equals(DateUtil.getyyyy_MM_dd(new Date())))
	318	+ {
	319	+ return new BaseResponse().setErrormsg("检查日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST);
	320	+ }
	321	+
	322	+ }
	323	+
314	324	AntenatalExaminationModel model = antExAddRequest.convertToDataModel();
315	325	//表示区域的
316	326	if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
...	...	@@ -622,6 +632,18 @@
622	632	StopWatch stopWatch = new StopWatch("addOneAnetExChu");
623	633
624	634	final String hospitalId = autoMatchFacade.getHospitalId(userId);
	635	+
	636	+
	637	+ //秦皇岛市山海关人民医院零时处理
	638	+ if (StringUtils.isNotEmpty(excAddRequest.getCheckTime()) && "1000000004".equals(hospitalId)) {
	639	+ if (!excAddRequest.getCheckTime().equals(DateUtil.getyyyy_MM_dd(new Date())))
	640	+ {
	641	+ return new BaseResponse().setErrormsg("检查日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST);
	642	+ }
	643	+
	644	+ }
	645	+
	646	+
625	647	/** 验证产检券是否可用可用就改为已使用状态 */
626	648	if (StringUtils.isNotBlank(excAddRequest.getCouponCode()) && excAddRequest.getCouponType() != null) {
627	649	stopWatch.start("couponService.validate");

...	...	@@ -4183,7 +4183,7 @@
4183	4183	public void autoGetBabyDiagnose() {
4184	4184
4185	4185	Date end = new Date();
4186		- Date start = new Date(end.getTime() - 3600000);
	4186	+ Date start = DateUtil.addDay(end,-2);
4187	4187
4188	4188	String lrrqStart = DateUtil.getYyyyMMddHHssmm(start);
4189	4189	String lrrqEnd = DateUtil.getYyyyMMddHHssmm(end);

...	...	@@ -212,6 +212,25 @@
212	212	* @return
213	213	*/
214	214	public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest, Integer userId) {
	215	+
	216	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	217	+
	218	+ //秦皇岛市山海关人民医院零时处理
	219	+ if (CollectionUtils.isNotEmpty(deliverAddRequest.getBabies()) && "1000000004".equals(hospitalId)) {
	220	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(deliverAddRequest.getBabies().get(0).getDueTime()))
	221	+ {
	222	+ Date birth = DateUtil.parseYMDHM(deliverAddRequest.getBabies().get(0).getDueTime());
	223	+ String birtStr = DateUtil.getyyyy_MM_dd(birth);
	224	+ if (!birtStr.equals(DateUtil.getyyyy_MM_dd(new Date())))
	225	+ {
	226	+ return new BaseResponse().setErrormsg("儿童分娩日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST);
	227	+ }
	228	+ }
	229	+
	230	+ }
	231	+
	232	+
	233	+
215	234	/** 验证产检券是否可用可用就改为已使用状态 */
216	235	if (StringUtils.isNotBlank(deliverAddRequest.getCouponCode()) && deliverAddRequest.getCouponType() != null) {
217	236	BaseObjectResponse resp = couponService.validate(deliverAddRequest.getCouponCode(), deliverAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
...	...	@@ -221,7 +240,7 @@
221	240	}
222	241
223	242	List<MaternalDeliverModel.Baby> babyList = new ArrayList<>();
224		- String hospitalId = autoMatchFacade.getHospitalId(userId);
	243	+
225	244	MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
226	245
227	246	//非卫计委出修改做区域隐藏建档