From 704f8b99761aee5dd7f997d8bfe3147fc7052b7b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 11 Nov 2022 13:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8D=AB=E7=94=9F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PatientSyncMysqlFacade.java | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 3a35551..5d9b56b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -3385,10 +3385,25 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } } hospitalDate.put("data10",data9_data8+"%"); + + //0-6岁儿童健康管理人数 - hospitalDate.put("data11",data9+lastDate9); + babyQuery.setCompleteCheck(null); + babyQuery.setLastCheckDoctor2(true); + int data11 = babyBookbuildingService.queryBabyCount(babyQuery); + int lastDate11= null==hospitalDate.get("data11")?0:Integer.parseInt(hospitalDate.get("data11").toString()); + hospitalDate.put("data11",data11+lastDate11); //0-6岁儿童健康管理率% - hospitalDate.put("data12",data9_data8+"%"); + String data11_data12="0.00"; + if(Integer.parseInt(hospitalDate.get("data8").toString())!=0){ + float v = (float) Integer.parseInt(hospitalDate.get("data11").toString()) / Integer.parseInt(hospitalDate.get("data8").toString()); + if(v>=1){ + data11_data12="100.00"; + }else { + data11_data12 = df.format(v * 100); + } + } + hospitalDate.put("data12",data11_data12+"%"); //0-6岁儿童眼保健及视力检查人数 @@ -3900,7 +3915,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalList(hospitalIds); patientsQuery.setBuildDaysStart(0); - patientsQuery.setBuildDaysEnd(13*7); + patientsQuery.setBuildDaysEnd(13*7-1); patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); patientsQuery.setDueStatus(0); -- 1.8.3.1