jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 47ce9d92799202366b242438c7f079cc439261eb

Authored by liquanyu
1 parent dda4827bc0
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 55 additions and 31 deletions

platform-operate-api/pom.xml View file @ 47ce9d9
... ... @@ -11,6 +11,19 @@
11 11 <artifactId>platform-operate-api</artifactId>
12 12  
13 13 <dependencies>
  14 + <!--出生证明上传使用-->
  15 + <!--<dependency>-->
  16 + <!--<groupId>org.apache.httpcomponents</groupId>-->
  17 + <!--<artifactId>httpclient</artifactId>-->
  18 + <!--<version>4.5</version>-->
  19 + <!--</dependency>-->
  20 +
  21 + <!--<dependency>-->
  22 + <!--<groupId>org.apache.httpcomponents</groupId>-->
  23 + <!--<artifactId>httpmime</artifactId>-->
  24 + <!--<version>4.5</version>-->
  25 + <!--</dependency>-->
  26 +
14 27 <!--<dependency>-->
15 28 <!--<groupId>org.apache.httpcomponents</groupId>-->
16 29 <!--<artifactId>httpclient</artifactId>-->
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java View file @ 47ce9d9
1   -package com.lyms.platform.operate.web;
2   -
  1 +//package com.lyms.platform.operate.web;
  2 +//
3 3 //import org.apache.commons.lang.StringUtils;
4 4 //import org.apache.http.HttpEntity;
5 5 //import org.apache.http.client.ClientProtocolException;
6 6  
7 7  
... ... @@ -16,21 +16,21 @@
16 16 //
17 17 //import java.io.File;
18 18 //import java.io.IOException;
19   -
20   -/**
21   - * Created by Administrator on 2016/8/22 0022.
22   - */
23   -public class Test {
24   -
25   - final static long TIME = 1000 * 90;
26 19 //
  20 +///**
  21 +// * Created by Administrator on 2016/8/22 0022.
  22 +// */
  23 +//public class Test {
  24 +//
  25 +// final static long TIME = 1000 * 90;
  26 +//
27 27 // public static void main(String[] args) throws Exception {
28 28 //
29 29 // File dir = new File("F:\\aa");
30 30 // File[] files = dir.listFiles();
31 31 // for (File file : files)
32 32 // {
33   -// upload("https://cert-hengshui-api.healthbaby.com.cn:8787/cp/common/importSignature", file, file.getName());
  33 +// upload("https://cert-chengde-api.healthbaby.com.cn:12356/cp/common/importSignature", file, file.getName());
34 34 // Thread.sleep(TIME);
35 35 // }
36 36 // }
... ... @@ -46,7 +46,7 @@
46 46 // StringBody comment = new StringBody(filename, ContentType.TEXT_PLAIN);
47 47 // HttpEntity reqEntity = MultipartEntityBuilder.create().addPart("file", bin).addPart("filename", comment).build();
48 48 // httppost.setEntity(reqEntity);
49   -// httppost.setHeader("Authorization","12b82e5ef40605bdf213b3c60c4dc69e");
  49 +// httppost.setHeader("Authorization","b625adb730344cb5967f88e5e9ea8ad3");
50 50 // CloseableHttpResponse response = httpclient.execute(httppost);
51 51 // try {
52 52 // System.out.println(response.getStatusLine());
... ... @@ -71,6 +71,8 @@
71 71 // }
72 72 // }
73 73 // }
74   -
75   -}
  74 +//
  75 +//}
  76 +//
  77 +//
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 47ce9d9
... ... @@ -738,7 +738,7 @@
738 738 babyModel.setFcertNo(patients.getHcertificateNum());
739 739 babyModel.setFcertTypeId(patients.getPcerteTypeId());
740 740 // babyModel.setDeliverOrg(patients.getDeliverOrg());
741   - babyModel.setHospitalId(patients.getHospitalId());
  741 + babyModel.setHospitalId(deliverAddRequest.getFmHospital()); //解决多档案分娩后在新生儿管理没有记录问题
742 742 babyModel.setDueDate(patients.getDueDate());
743 743 babyModel.setDueType(patients.getDueType());
744 744 babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 47ce9d9
... ... @@ -6349,6 +6349,7 @@
6349 6349 patientsQuery.setType(3);
6350 6350  
6351 6351 String hospitalId;
  6352 + String cityId = "";
6352 6353 if (StringUtils.isNotEmpty(hospitalName)) {
6353 6354 OrganizationQuery query = new OrganizationQuery();
6354 6355 query.setName(hospitalName.trim());
... ... @@ -6356,6 +6357,7 @@
6356 6357 List<Organization> organizations = organizationService.queryOrganization(query);
6357 6358 if (CollectionUtils.isNotEmpty(organizations)) {
6358 6359 hospitalId = String.valueOf(organizations.get(0).getId());
  6360 + cityId = String.valueOf(organizations.get(0).getCityId());
6359 6361 patientsQuery.setHospitalId(hospitalId);
6360 6362 } else {
6361 6363 deliverMap.put("motherinfo", new ArrayList<>());
6362 6364  
... ... @@ -6369,9 +6371,17 @@
6369 6371 List<Patients> list;
6370 6372 String patientId = getPatientId(idCard);
6371 6373 if (StringUtils.isNotEmpty(patientId)) {
6372   - //list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId).and("hospitalId").is(hospitalId)), Patients.class);
  6374 + //衡水市
  6375 + if ("12".equals(cityId))
  6376 + {
  6377 + list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId)), Patients.class);
  6378 + }
  6379 + else
  6380 + {
  6381 + list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId).and("hospitalId").is(hospitalId)), Patients.class);
6373 6382  
6374   - list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId)), Patients.class);
  6383 + }
  6384 +
6375 6385 } else {
6376 6386 list = patientsService.queryPatient1(patientsQuery, "created");
6377 6387 }
6378 6388  
... ... @@ -6660,20 +6670,21 @@
6660 6670  
6661 6671 Map<String, Object> patientMap = new HashMap<>();
6662 6672 PatientsQuery patientsQuery = new PatientsQuery();
6663   - if (StringUtils.isNotEmpty(hospitalName)) {
6664   - OrganizationQuery query = new OrganizationQuery();
6665   - query.setName(hospitalName.trim());
6666   - query.setYn(YnEnums.YES.getId());
6667   - List<Organization> organizations = organizationService.queryOrganization(query);
6668   - if (CollectionUtils.isNotEmpty(organizations)) {
6669   - patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId()));
6670   - } else {
6671   - return patientMap;
6672   - }
6673   - } else {
6674   - return patientMap;
6675   - }
  6673 +// if (StringUtils.isNotEmpty(hospitalName)) {
  6674 +// OrganizationQuery query = new OrganizationQuery();
  6675 +// query.setName(hospitalName.trim());
  6676 +// query.setYn(YnEnums.YES.getId());
  6677 +// List<Organization> organizations = organizationService.queryOrganization(query);
  6678 +// if (CollectionUtils.isNotEmpty(organizations)) {
  6679 +// patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId()));
  6680 +// } else {
  6681 +// return patientMap;
  6682 +// }
  6683 +// } else {
  6684 +// return patientMap;
  6685 +// }
6676 6686 patientsQuery.setCardNo(idCard);
  6687 + patientsQuery.setYn(YnEnums.YES.getId());
6677 6688 List<Patients> list = patientsService.queryPatient1(patientsQuery, "created");
6678 6689 if (CollectionUtils.isNotEmpty(list)) {
6679 6690 Patients patients = list.get(0);