fangcheng / regional-platform

Download as
Browse Code »

Commit d2aa2be0f5769b0dc04c31ca93c98cc1f39f35fd

Authored by jiangjiazhi
1 parent 566d1c591b
Exists in master and in 1 other branch nobuildprocess

孕妇分娩后 变成产妇

Showing 3 changed files with 7 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ d2aa2be
... ... @@ -219,11 +219,11 @@
219 219 this.serviceStatus = serviceStatus;
220 220 }
221 221  
222   - public int getType() {
  222 + public Integer getType() {
223 223 return type;
224 224 }
225 225  
226   - public void setType(int type) {
  226 + public void setType(Integer type) {
227 227 this.type = type;
228 228 }
229 229  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ d2aa2be
... ... @@ -358,7 +358,7 @@
358 358 * @param vcCardNo
359 359 * @return
360 360 */
361   - public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId) {
  361 + public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId,Integer type) {
362 362 PatientsQuery patientsQuery = new PatientsQuery();
363 363 if (StringUtils.isNotEmpty(cardNo)) {
364 364 patientsQuery.setCardNo(cardNo);
... ... @@ -367,6 +367,7 @@
367 367 } else if (StringUtils.isNotEmpty(id)) {
368 368 patientsQuery.setId(id);
369 369 }
  370 + patientsQuery.setType(type);
370 371 patientsQuery.setHospitalId(hospitalId);
371 372 patientsQuery.setYn(YnEnums.YES.getId());
372 373 Patients patients = null;
... ... @@ -437,8 +438,8 @@
437 438 hospital = list1.get(0) + "";
438 439 }
439 440 //查询产妇数据
440   - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital);
441   - patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null);
  441 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital,1);
  442 + patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null,1);
442 443 }
443 444  
444 445 if (null == patients) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ d2aa2be
... ... @@ -251,7 +251,7 @@
251 251 hospital= list1.get(0) + "";
252 252 }
253 253 //获取
254   - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hospital);
  254 + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hospital,3);
255 255 if (null == patients) {
256 256 return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
257 257 }