diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java index d011acc..c74e064 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java @@ -141,11 +141,11 @@ public class MatdeliverFollowModel extends BaseModel { /** * 乳房 */ - private String breast; + private Integer breast; /** * 恶露 */ - private String lochia; + private Integer lochia; /** * 子宫 */ @@ -153,7 +153,7 @@ public class MatdeliverFollowModel extends BaseModel { /** * 伤口 */ - private String wound; + private Integer wound; /** * 其他 */ @@ -528,24 +528,28 @@ public class MatdeliverFollowModel extends BaseModel { } - public String getBreast() { + public Integer getBreast() { return breast; } - - public void setBreast(String breast) { + public void setBreast(Integer breast) { this.breast = breast; - } - public String getLochia() { + public Integer getLochia() { return lochia; } - - public void setLochia(String lochia) { + public void setLochia(Integer lochia) { this.lochia = lochia; + } + public Integer getWound() { + return wound; + } + + public void setWound(Integer wound) { + this.wound = wound; } public String getMatrix() { @@ -558,16 +562,6 @@ public class MatdeliverFollowModel extends BaseModel { } - public String getWound() { - return wound; - } - - - public void setWound(String wound) { - this.wound = wound; - - } - public String getOtherDesc() { return otherDesc; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 254a596..e9e07ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -8,7 +8,10 @@ import com.lyms.platform.biz.JdbcUtil; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.enums.SieveStatusEnums; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.CompressEncodeingUtil; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.BabyCheckFacade; import com.lyms.platform.operate.web.facade.SieveFacade; @@ -146,10 +149,10 @@ public class TestController { patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setNeed("need"); patientsQuery.setType(1); int patientCount = patientsService.queryPatientCount(patientsQuery); + System.out.println("一共需要处理数据量："+patientCount); //预计开启10个线程处理，计算每个线程需要处理的数据量 int batchSize = patientCount/10; @@ -160,7 +163,7 @@ public class TestController { if (end > patientCount) { end = patientCount+1; } - listFuture.add(commonThreadPool.submit(new BuildSerToPatientSerWorker(i, end,patientsService,patientServiceService,isSkip,isZjzx,batchSize))); + listFuture.add(commonThreadPool.submit(new BuildSerToPatientSerWorker(i, end,patientsService,patientServiceService,isSkip,isZjzx,batchSize,patientCount))); } // for (Future f : listFuture) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java index d56ad53..c4f9973 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java @@ -25,6 +25,22 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{ */ private String contactReasonStr; /** + * 预约访视日期 + */ + private String makeVisitDateStr; + /** + * 预约操作员 + */ + private String makeCreateUserStr; + /** + * 预约操作日期 + */ + private String makeCreateDateStr; + /** + * 访视日期 + */ + private String visitDateStr; + /** * 访视结果（1-成功、2-失败） */ private String visitResultStr; @@ -65,10 +81,26 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{ */ private String leaveDateStr; /** + * 乳房 + */ + private String breastStr; + /** + * 恶露 + */ + private String lochiaStr; + /** + * 伤口 + */ + private String woundStr; + /** * 分类(1-未见异常、2-异常) */ private String healthTypeStr; /** + * 指导意见 + */ + private String guideSuggestStr; + /** * 是否转诊转诊（1-无、2-有） */ private String isReferStr; @@ -119,6 +151,15 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{ if(matdeliverFollowModel.getHealthType()!=null){ healthTypeStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getHealthType()); } + if(matdeliverFollowModel.getBreast()!=null){ + breastStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getBreast()); + } + if(matdeliverFollowModel.getLochia()!=null){ + lochiaStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getLochia()); + } + if(matdeliverFollowModel.getWound()!=null){ + woundStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getWound()); + } if(matdeliverFollowModel.getIsRefer()!=null){//（1-无、2-有） isReferStr = matdeliverFollowModel.getIsRefer() == 1?"无":"有"; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java index 865ff68..614fe86 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java @@ -25,12 +25,14 @@ public class BuildSerToPatientSerWorker implements Callable { private int startIndex; private int endIndex; private int batchSize; + private int allCount; private boolean isSkip; private boolean isZjzx; private PatientsService patientsService; private PatientServiceService patientServiceService; - public BuildSerToPatientSerWorker(int startIndex, int endIndex, PatientsService patientsService, PatientServiceService patientServiceService, boolean isSkip, boolean isZjzx, int batchSize) { + public BuildSerToPatientSerWorker(int startIndex, int endIndex, PatientsService patientsService, PatientServiceService patientServiceService, boolean isSkip, boolean isZjzx, int batchSize,int allCount) { + this.allCount = allCount; this.startIndex = startIndex; this.endIndex = endIndex; this.patientsService = patientsService; @@ -53,6 +55,7 @@ public class BuildSerToPatientSerWorker implements Callable { public Object call() { try { for (int i = startIndex; i < endIndex; i += batchSize) { + System.out.println("总数据量："+allCount+"，正在处理第：" + i+"--到--"+(i+batchSize)); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setLimit(batchSize); patientsQuery.setPage((i + batchSize) / batchSize); @@ -64,7 +67,6 @@ public class BuildSerToPatientSerWorker implements Callable { patientsQuery.setType(1); List patients = patientsService.queryPatient(patientsQuery); for (Patients pt : patients) { - System.out.println("正在处理：" + pt.getId()); if (pt.getServiceType() == null) { continue; }