jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1a217affaadd796e1456a0ac36e4f2615a62fc53

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

服务同步

Showing 4 changed files with 65 additions and 25 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java View file @ 1a217af
... ... @@ -141,11 +141,11 @@
141 141 /**
142 142 * 乳房
143 143 */
144   - private String breast;
  144 + private Integer breast;
145 145 /**
146 146 * 恶露
147 147 */
148   - private String lochia;
  148 + private Integer lochia;
149 149 /**
150 150 * 子宫
151 151 */
... ... @@ -153,7 +153,7 @@
153 153 /**
154 154 * 伤口
155 155 */
156   - private String wound;
  156 + private Integer wound;
157 157 /**
158 158 * 其他
159 159 */
160 160  
161 161  
162 162  
163 163  
164 164  
165 165  
166 166  
... ... @@ -528,26 +528,30 @@
528 528  
529 529 }
530 530  
531   - public String getBreast() {
  531 + public Integer getBreast() {
532 532 return breast;
533 533 }
534 534  
535   -
536   - public void setBreast(String breast) {
  535 + public void setBreast(Integer breast) {
537 536 this.breast = breast;
538   -
539 537 }
540 538  
541   - public String getLochia() {
  539 + public Integer getLochia() {
542 540 return lochia;
543 541 }
544 542  
545   -
546   - public void setLochia(String lochia) {
  543 + public void setLochia(Integer lochia) {
547 544 this.lochia = lochia;
  545 + }
548 546  
  547 + public Integer getWound() {
  548 + return wound;
549 549 }
550 550  
  551 + public void setWound(Integer wound) {
  552 + this.wound = wound;
  553 + }
  554 +
551 555 public String getMatrix() {
552 556 return matrix;
553 557 }
... ... @@ -555,16 +559,6 @@
555 559  
556 560 public void setMatrix(String matrix) {
557 561 this.matrix = matrix;
558   -
559   - }
560   -
561   - public String getWound() {
562   - return wound;
563   - }
564   -
565   -
566   - public void setWound(String wound) {
567   - this.wound = wound;
568 562  
569 563 }
570 564  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 1a217af
... ... @@ -8,7 +8,10 @@
8 8 import com.lyms.platform.biz.service.*;
9 9 import com.lyms.platform.common.enums.SieveStatusEnums;
10 10 import com.lyms.platform.common.enums.YnEnums;
11   -import com.lyms.platform.common.utils.*;
  11 +import com.lyms.platform.common.utils.CompressEncodeingUtil;
  12 +import com.lyms.platform.common.utils.DateUtil;
  13 +import com.lyms.platform.common.utils.ExceptionUtils;
  14 +import com.lyms.platform.common.utils.JsonUtil;
12 15 import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
13 16 import com.lyms.platform.operate.web.facade.BabyCheckFacade;
14 17 import com.lyms.platform.operate.web.facade.SieveFacade;
15 18  
... ... @@ -146,10 +149,10 @@
146 149 patientsQuery.setExtEnable(false);
147 150 patientsQuery.setBuildTypeNot(1);
148 151 patientsQuery.setYn(YnEnums.YES.getId());
149   - patientsQuery.setNeed("need");
150 152 patientsQuery.setType(1);
151 153  
152 154 int patientCount = patientsService.queryPatientCount(patientsQuery);
  155 + System.out.println("一共需要处理数据量："+patientCount);
153 156  
154 157 //预计开启10个线程处理，计算每个线程需要处理的数据量
155 158 int batchSize = patientCount/10;
... ... @@ -160,7 +163,7 @@
160 163 if (end > patientCount) {
161 164 end = patientCount+1;
162 165 }
163   - listFuture.add(commonThreadPool.submit(new BuildSerToPatientSerWorker(i, end,patientsService,patientServiceService,isSkip,isZjzx,batchSize)));
  166 + listFuture.add(commonThreadPool.submit(new BuildSerToPatientSerWorker(i, end,patientsService,patientServiceService,isSkip,isZjzx,batchSize,patientCount)));
164 167 }
165 168  
166 169 // for (Future f : listFuture) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java View file @ 1a217af
... ... @@ -25,6 +25,22 @@
25 25 */
26 26 private String contactReasonStr;
27 27 /**
  28 + * 预约访视日期
  29 + */
  30 + private String makeVisitDateStr;
  31 + /**
  32 + * 预约操作员
  33 + */
  34 + private String makeCreateUserStr;
  35 + /**
  36 + * 预约操作日期
  37 + */
  38 + private String makeCreateDateStr;
  39 + /**
  40 + * 访视日期
  41 + */
  42 + private String visitDateStr;
  43 + /**
28 44 * 访视结果（1-成功、2-失败）
29 45 */
30 46 private String visitResultStr;
31 47  
... ... @@ -65,10 +81,26 @@
65 81 */
66 82 private String leaveDateStr;
67 83 /**
  84 + * 乳房
  85 + */
  86 + private String breastStr;
  87 + /**
  88 + * 恶露
  89 + */
  90 + private String lochiaStr;
  91 + /**
  92 + * 伤口
  93 + */
  94 + private String woundStr;
  95 + /**
68 96 * 分类(1-未见异常、2-异常)
69 97 */
70 98 private String healthTypeStr;
71 99 /**
  100 + * 指导意见
  101 + */
  102 + private String guideSuggestStr;
  103 + /**
72 104 * 是否转诊转诊（1-无、2-有）
73 105 */
74 106 private String isReferStr;
... ... @@ -118,6 +150,15 @@
118 150 }
119 151 if(matdeliverFollowModel.getHealthType()!=null){
120 152 healthTypeStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getHealthType());
  153 + }
  154 + if(matdeliverFollowModel.getBreast()!=null){
  155 + breastStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getBreast());
  156 + }
  157 + if(matdeliverFollowModel.getLochia()!=null){
  158 + lochiaStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getLochia());
  159 + }
  160 + if(matdeliverFollowModel.getWound()!=null){
  161 + woundStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getWound());
121 162 }
122 163 if(matdeliverFollowModel.getIsRefer()!=null){//（1-无、2-有）
123 164 isReferStr = matdeliverFollowModel.getIsRefer() == 1?"无":"有";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java View file @ 1a217af
... ... @@ -25,12 +25,14 @@
25 25 private int startIndex;
26 26 private int endIndex;
27 27 private int batchSize;
  28 + private int allCount;
28 29 private boolean isSkip;
29 30 private boolean isZjzx;
30 31 private PatientsService patientsService;
31 32 private PatientServiceService patientServiceService;
32 33  
33   - public BuildSerToPatientSerWorker(int startIndex, int endIndex, PatientsService patientsService, PatientServiceService patientServiceService, boolean isSkip, boolean isZjzx, int batchSize) {
  34 + public BuildSerToPatientSerWorker(int startIndex, int endIndex, PatientsService patientsService, PatientServiceService patientServiceService, boolean isSkip, boolean isZjzx, int batchSize,int allCount) {
  35 + this.allCount = allCount;
34 36 this.startIndex = startIndex;
35 37 this.endIndex = endIndex;
36 38 this.patientsService = patientsService;
... ... @@ -53,6 +55,7 @@
53 55 public Object call() {
54 56 try {
55 57 for (int i = startIndex; i < endIndex; i += batchSize) {
  58 + System.out.println("总数据量："+allCount+"，正在处理第：" + i+"--到--"+(i+batchSize));
56 59 PatientsQuery patientsQuery = new PatientsQuery();
57 60 patientsQuery.setLimit(batchSize);
58 61 patientsQuery.setPage((i + batchSize) / batchSize);
... ... @@ -64,7 +67,6 @@
64 67 patientsQuery.setType(1);
65 68 List<Patients> patients = patientsService.queryPatient(patientsQuery);
66 69 for (Patients pt : patients) {
67   - System.out.println("正在处理：" + pt.getId());
68 70 if (pt.getServiceType() == null) {
69 71 continue;
70 72 }