liquanyu / regional-platform

Commit 5d4ffdbb12eae6634a5cd9b64ca724e4ebca8362

Authored by wtt over 5 years ago

update

Showing 2 changed files with 30 additions and 5 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/request/AntenatalExaminationQueryRequest.java

...	...	@@ -131,8 +131,9 @@
131	131	private ITrackDownService trackDownService;
132	132	@Autowired
133	133	private TrackDownRecordService trackDownRecordService;
134		-
135	134	@Autowired
	135	+ private BreastFacade breastFacade;
	136	+ @Autowired
136	137	private HosptialHighRiskFacade highRiskFacade;
137	138
138	139	@Autowired
139	140
140	141
...	...	@@ -3408,12 +3409,26 @@
3408	3409	if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
3409	3410	patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
3410	3411	}
	3412	+ if("1".equals(queryRequest.getYcState())){
	3413	+ try {
	3414	+ BaseObjectResponse baseResponse = (BaseObjectResponse)breastFacade.getPatient(queryRequest, userId);
	3415	+ if(baseResponse!=null && baseResponse.getData()!=null){
	3416	+ patients = (Patients) baseResponse.getData();
	3417	+ }else {
	3418	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
	3419	+ }
	3420	+ } catch (Exception e) {
	3421	+ e.printStackTrace();
	3422	+ }
3411	3423
3412		- //原来单机
3413		- if (null != patients) {
3414		- return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档");
	3424	+ }else {
	3425	+ //原来单机
	3426	+ if (null != patients) {
	3427	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档");
	3428	+ }
	3429	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
3415	3430	}
3416		- return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
	3431	+
3417	3432	}
3418	3433	}
3419	3434

...	...	@@ -22,12 +22,22 @@
22	22	private String vcCardNo;
23	23
24	24	private String patientId;
	25	+ // 1孕妇产妇都可以查询，不传参数继续原理逻辑
	26	+ private String ycState;
25	27
26	28	private String barCode;
27	29
28	30	private String coupon;
29	31
30	32	private String supplement;
	33	+
	34	+ public String getYcState() {
	35	+ return ycState;
	36	+ }
	37	+
	38	+ public void setYcState(String ycState) {
	39	+ this.ycState = ycState;
	40	+ }
31	41
32	42	public String getSupplement() {
33	43	return supplement;