jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d3771079b227563ae2a2b11f69c25bda7541ade4

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

update

Showing 2 changed files with 32 additions and 36 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java View file @ d377107
... ... @@ -16,10 +16,7 @@
16 16 import com.lyms.platform.operate.web.utils.ReportConfig;
17 17 import com.lyms.platform.pojo.BodyMassAnalysisModel;
18 18 import com.lyms.platform.pojo.Patients;
19   -import com.lyms.platform.pojo.TemporaryUserModel;
20 19 import com.lyms.platform.pojo.VolumeComponentAnalysisModel;
21   -import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIConversion;
22   -import org.apache.poi.util.StringUtil;
23 20 import org.springframework.beans.factory.annotation.Autowired;
24 21 import org.springframework.data.domain.Sort;
25 22 import org.springframework.data.mongodb.core.MongoTemplate;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java View file @ d377107
... ... @@ -119,11 +119,11 @@
119 119 //复诊次数
120 120 List<AntenatalExaminationModel> ant = null;
121 121 if (CollectionUtils.isNotEmpty(chu)) {
122   - for(AntExChuModel a : chu){//唐山滦县导出判断初诊是否是本院
123   - if(StringUtils.isNotEmpty(a.getHospitalId())){
124   - if(a.getHospitalId().equals(hospital)){
  122 + for (AntExChuModel a : chu) {//唐山滦县导出判断初诊是否是本院
  123 + if (StringUtils.isNotEmpty(a.getHospitalId())) {
  124 + if (a.getHospitalId().equals(hospital)) {
125 125 twinsPatientsResult.setYi("本院");
126   - }else{
  126 + } else {
127 127 twinsPatientsResult.setYi("外院");
128 128 }
129 129 break;
130 130  
131 131  
132 132  
133 133  
134 134  
135 135  
136 136  
137 137  
... ... @@ -133,33 +133,33 @@
133 133 }
134 134  
135 135 //唐山滦县判断复诊是否是本院
136   - if(CollectionUtils.isNotEmpty(ant)){
137   - for(int k = 0;k < ant.size();k++){
138   - if(k>=4){
  136 + if (CollectionUtils.isNotEmpty(ant)) {
  137 + for (int k = 0; k < ant.size(); k++) {
  138 + if (k >= 4) {
139 139 break;
140 140 }
141   - if(0==k){
142   - if(ant.get(k).getHospitalId().equals(hospital)){
  141 + if (0 == k) {
  142 + if (ant.get(k).getHospitalId().equals(hospital)) {
143 143 twinsPatientsResult.setEr("本院");
144   - }else{
  144 + } else {
145 145 twinsPatientsResult.setEr("外院");
146 146 }
147   - }else if(1==k){
148   - if(ant.get(k).getHospitalId().equals(hospital)){
  147 + } else if (1 == k) {
  148 + if (ant.get(k).getHospitalId().equals(hospital)) {
149 149 twinsPatientsResult.setSan("本院");
150   - }else{
  150 + } else {
151 151 twinsPatientsResult.setSan("外院");
152 152 }
153   - }else if(2==k){
154   - if(ant.get(k).getHospitalId().equals(hospital)){
  153 + } else if (2 == k) {
  154 + if (ant.get(k).getHospitalId().equals(hospital)) {
155 155 twinsPatientsResult.setSi("本院");
156   - }else{
  156 + } else {
157 157 twinsPatientsResult.setSi("外院");
158 158 }
159   - }else if(3==k){
160   - if(ant.get(k).getHospitalId().equals(hospital)){
  159 + } else if (3 == k) {
  160 + if (ant.get(k).getHospitalId().equals(hospital)) {
161 161 twinsPatientsResult.setWu("本院");
162   - }else{
  162 + } else {
163 163 twinsPatientsResult.setWu("外院");
164 164 }
165 165 }
166 166  
... ... @@ -276,14 +276,11 @@
276 276 }
277 277  
278 278 if (!"-".equals(twinsPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) {
279   - twinsPatientsResult.setrFactor(twinsPatientsResult.getrFactor()+","+patients.getoRiskFactor());
280   - }else if (StringUtils.isNotEmpty(patients.getoRiskFactor()))
281   - {
  279 + twinsPatientsResult.setrFactor(twinsPatientsResult.getrFactor() + "," + patients.getoRiskFactor());
  280 + } else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) {
282 281 twinsPatientsResult.setrFactor(patients.getoRiskFactor());
283 282 }
284   - }
285   - else if (StringUtils.isNotEmpty(patients.getoRiskFactor()))
286   - {
  283 + } else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) {
287 284 twinsPatientsResult.setrFactor(patients.getoRiskFactor());
288 285 }
289 286 List level = new ArrayList();
290 287  
291 288  
292 289  
293 290  
... ... @@ -311,22 +308,24 @@
311 308 twinsPatientsResult.setrLevel(HighScoreResult.filter(level));
312 309 }
313 310 stopWatch.stop();
314   - if(twinsPatientsResult.getrFactor() !=null ){
  311 + if (twinsPatientsResult.getrFactor() != null) {
315 312 //双绒双羊、单绒单羊、单绒双羊
316   - if("1".equals(twinsType)){
317   - if(twinsPatientsResult.getrFactor().contains("双绒双羊")){
  313 + if ("1".equals(twinsType)) {
  314 + if (twinsPatientsResult.getrFactor().contains("双绒双羊")) {
318 315 data.add(twinsPatientsResult);
319 316 }
320 317  
321   - } else if("2".equals(twinsType)){
322   - if(twinsPatientsResult.getrFactor().contains("单绒双羊")){
  318 + } else if ("2".equals(twinsType)) {
  319 + if (twinsPatientsResult.getrFactor().contains("单绒双羊")) {
323 320 data.add(twinsPatientsResult);
324 321 }
325   - } else if("3".equals(twinsType)){
326   - if(twinsPatientsResult.getrFactor().contains("单绒单羊")){
  322 + } else if ("3".equals(twinsType)) {
  323 + if (twinsPatientsResult.getrFactor().contains("单绒单羊")) {
327 324 data.add(twinsPatientsResult);
328 325 }
329   - }else {
  326 + } else if (twinsPatientsResult.getrFactor().contains("双绒双羊") ||
  327 + twinsPatientsResult.getrFactor().contains("单绒双羊") ||
  328 + twinsPatientsResult.getrFactor().contains("单绒单羊")) {
330 329 data.add(twinsPatientsResult);
331 330 }
332 331 }