jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 38e8d666f3d0da1108fa6c37af57ca9b143ba8e6

Authored by landong2015
2 parents 44be81d889 0b2122a66e
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java View file @ 38e8d66
... ... @@ -42,8 +42,8 @@
42 42 }
43 43  
44 44 public void setHospitalId(String hospitalId) {
45   - if (StringUtils.isBlank(hospitalId)) {
46   - this.hospitalId = hospitalId;
  45 + if (StringUtils.isNotBlank(hospitalId)) {
  46 + this.hospitalId = hospitalId.trim();
47 47 } else {
48 48 this.hospitalId = null;
49 49 }
... ... @@ -72,8 +72,8 @@
72 72 }
73 73  
74 74 public void setPatientFid(String patientFid) {
75   - if (StringUtils.isBlank(patientFid)) {
76   - this.patientFid = hospitalId;
  75 + if (StringUtils.isNotBlank(patientFid)) {
  76 + this.patientFid = patientFid.trim();
77 77 } else {
78 78 this.patientFid = null;
79 79 }
... ... @@ -84,8 +84,8 @@
84 84 }
85 85  
86 86 public void setPatientHid(String patientHid) {
87   - if (StringUtils.isBlank(patientHid)) {
88   - this.patientHid = patientHid;
  87 + if (StringUtils.isNotBlank(patientHid)) {
  88 + this.patientHid = patientHid.trim();
89 89 } else {
90 90 this.patientHid = null;
91 91 }
... ... @@ -96,8 +96,8 @@
96 96 }
97 97  
98 98 public void setVcCardNo(String vcCardNo) {
99   - if (StringUtils.isBlank(vcCardNo)) {
100   - this.vcCardNo = vcCardNo;
  99 + if (StringUtils.isNotBlank(vcCardNo)) {
  100 + this.vcCardNo = vcCardNo.trim();
101 101 } else {
102 102 this.vcCardNo = null;
103 103 }
... ... @@ -108,8 +108,8 @@
108 108 }
109 109  
110 110 public void setName(String name) {
111   - if (StringUtils.isBlank(name)) {
112   - this.name = name;
  111 + if (StringUtils.isNotBlank(name)) {
  112 + this.name = name.trim();
113 113 } else {
114 114 this.name = null;
115 115 }
... ... @@ -120,8 +120,8 @@
120 120 }
121 121  
122 122 public void setSex(String sex) {
123   - if (StringUtils.isBlank(sex)) {
124   - this.sex = sex;
  123 + if (StringUtils.isNotBlank(sex)) {
  124 + this.sex = sex.trim();
125 125 } else {
126 126 this.sex = null;
127 127 }
... ... @@ -140,8 +140,8 @@
140 140 }
141 141  
142 142 public void setDeptCode(String deptCode) {
143   - if (StringUtils.isBlank(deptCode)) {
144   - this.deptCode = deptCode;
  143 + if (StringUtils.isNotBlank(deptCode)) {
  144 + this.deptCode = deptCode.trim();
145 145 } else {
146 146 this.deptCode = null;
147 147 }
... ... @@ -152,8 +152,8 @@
152 152 }
153 153  
154 154 public void setDeptName(String deptName) {
155   - if (StringUtils.isBlank(deptName)) {
156   - this.deptName = deptName;
  155 + if (StringUtils.isNotBlank(deptName)) {
  156 + this.deptName = deptName.trim();
157 157 } else {
158 158 this.deptName = null;
159 159 }
... ... @@ -164,8 +164,8 @@
164 164 }
165 165  
166 166 public void setApplyDoctorCode(String applyDoctorCode) {
167   - if (StringUtils.isBlank(applyDoctorCode)) {
168   - this.applyDoctorCode = applyDoctorCode;
  167 + if (StringUtils.isNotBlank(applyDoctorCode)) {
  168 + this.applyDoctorCode = applyDoctorCode.trim();
169 169 } else {
170 170 this.applyDoctorCode = null;
171 171 }
... ... @@ -176,8 +176,8 @@
176 176 }
177 177  
178 178 public void setApplyDoctorName(String applyDoctorName) {
179   - if (StringUtils.isBlank(applyDoctorName)) {
180   - this.applyDoctorName = applyDoctorName;
  179 + if (StringUtils.isNotBlank(applyDoctorName)) {
  180 + this.applyDoctorName = applyDoctorName.trim();
181 181 } else {
182 182 this.applyDoctorName = null;
183 183 }
... ... @@ -188,8 +188,8 @@
188 188 }
189 189  
190 190 public void setCheckDoctorCode(String checkDoctorCode) {
191   - if (StringUtils.isBlank(checkDoctorCode)) {
192   - this.checkDoctorCode = checkDoctorCode;
  191 + if (StringUtils.isNotBlank(checkDoctorCode)) {
  192 + this.checkDoctorCode = checkDoctorCode.trim();
193 193 } else {
194 194 this.checkDoctorCode = null;
195 195 }
... ... @@ -200,8 +200,8 @@
200 200 }
201 201  
202 202 public void setCheckDoctorName(String checkDoctorName) {
203   - if (StringUtils.isBlank(checkDoctorName)) {
204   - this.checkDoctorName = checkDoctorName;
  203 + if (StringUtils.isNotBlank(checkDoctorName)) {
  204 + this.checkDoctorName = checkDoctorName.trim();
205 205 } else {
206 206 this.checkDoctorName = null;
207 207 }
platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java View file @ 38e8d66
... ... @@ -23,7 +23,7 @@
23 23 }
24 24  
25 25 public void setId(String id) {
26   - if (StringUtils.isBlank(id)) {
  26 + if (StringUtils.isNotBlank(id)) {
27 27 this.id = id;
28 28 } else {
29 29 this.id = null;
... ... @@ -35,8 +35,8 @@
35 35 }
36 36  
37 37 public void setCode(String code) {
38   - if (StringUtils.isBlank(code)) {
39   - this.code = code;
  38 + if (StringUtils.isNotBlank(code)) {
  39 + this.code = code.trim();
40 40 } else {
41 41 this.code = null;
42 42 }
... ... @@ -47,8 +47,8 @@
47 47 }
48 48  
49 49 public void setName(String name) {
50   - if (StringUtils.isBlank(name)) {
51   - this.name = name;
  50 + if (StringUtils.isNotBlank(name)) {
  51 + this.name = name.trim();
52 52 } else {
53 53 this.name = null;
54 54 }
... ... @@ -59,8 +59,8 @@
59 59 }
60 60  
61 61 public void setResult(String result) {
62   - if (StringUtils.isBlank(result)) {
63   - this.result = result;
  62 + if (StringUtils.isNotBlank(result)) {
  63 + this.result = result.trim();
64 64 } else {
65 65 this.result = null;
66 66 }
... ... @@ -71,8 +71,8 @@
71 71 }
72 72  
73 73 public void setCharResult(String charResult) {
74   - if (StringUtils.isBlank(charResult)) {
75   - this.charResult = charResult;
  74 + if (StringUtils.isNotBlank(charResult)) {
  75 + this.charResult = charResult.trim();
76 76 } else {
77 77 this.charResult = null;
78 78 }
... ... @@ -83,8 +83,8 @@
83 83 }
84 84  
85 85 public void setNumberResult(String numberResult) {
86   - if (StringUtils.isBlank(numberResult)) {
87   - this.numberResult = numberResult;
  86 + if (StringUtils.isNotBlank(numberResult)) {
  87 + this.numberResult = numberResult.trim();
88 88 } else {
89 89 this.numberResult = null;
90 90 }
... ... @@ -95,8 +95,8 @@
95 95 }
96 96  
97 97 public void setFlag(String flag) {
98   - if (StringUtils.isBlank(flag)) {
99   - this.flag = flag;
  98 + if (StringUtils.isNotBlank(flag)) {
  99 + this.flag = flag.trim();
100 100 } else {
101 101 this.flag = null;
102 102 }
... ... @@ -107,8 +107,8 @@
107 107 }
108 108  
109 109 public void setRef(String ref) {
110   - if (StringUtils.isBlank(ref)) {
111   - this.ref = ref;
  110 + if (StringUtils.isNotBlank(ref)) {
  111 + this.ref = ref.trim();
112 112 } else {
113 113 this.ref = null;
114 114 }
... ... @@ -119,8 +119,8 @@
119 119 }
120 120  
121 121 public void setUnit(String unit) {
122   - if (StringUtils.isBlank(unit)) {
123   - this.unit = unit;
  122 + if (StringUtils.isNotBlank(unit)) {
  123 + this.unit = unit.trim();
124 124 } else {
125 125 this.unit = null;
126 126 }
... ... @@ -131,8 +131,8 @@
131 131 }
132 132  
133 133 public void setResultType(String resultType) {
134   - if (StringUtils.isBlank(resultType)) {
135   - this.resultType = resultType;
  134 + if (StringUtils.isNotBlank(resultType)) {
  135 + this.resultType = resultType.trim();
136 136 } else {
137 137 this.resultType = null;
138 138 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ 38e8d66
... ... @@ -70,13 +70,16 @@
70 70  
71 71 for (LisReport report:list) {
72 72 patientsQuery.setVcCardNo(report.getVcCardNo());
73   - List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
74   -
  73 + int count = patientsService.queryPatientCount(patientsQuery);
75 74 LisReportQuery lisReportQuery = new LisReportQuery();
76 75 lisReportQuery.setVcCardNo(report.getVcCardNo());
77 76 lisReportQuery.setHospitalId(""+hospitalId);
78 77 int reportCount = lisReportService.queryLisReportCount(lisReportQuery);
79   - if (patientsList != null && patientsList.size() > 0 && reportCount == 0) {
  78 + if (count > 0 && reportCount == 0) {
  79 + patientsQuery.setLimit(1);
  80 + patientsQuery.setPage(0);
  81 + patientsQuery.setNeed("y");
  82 + List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
80 83 Patients patients = patientsList.get(0);
81 84 LisCrisisItem crisisItem = new LisCrisisItem();
82 85 crisisItem.setPhone(patients.getPhone());