From 5d875d9ca48cd4a5714aa890752024b3f27d80ae Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 9 Jul 2024 10:55:08 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96system.out=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/BasicConfigServiceTest.java | 156 ++++++++++----------- .../permission/service/impl/CouponServiceImpl.java | 2 +- .../permission/service/impl/RisServiceImpl.java | 2 +- .../java/com/lyms/hospitalapi/hs/HsDataUtil.java | 12 +- .../com/lyms/hospitalapi/hs/HsfyFmService.java | 4 +- .../lyms/hospitalapi/hs/SyncHsPatientService.java | 6 +- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 32 ++--- .../operate/web/facade/AnnualReportFacade.java | 2 +- .../web/facade/BabyAutismDiagnoseFacade.java | 4 +- .../web/facade/BabyKindergartenCheckFacade.java | 6 +- .../web/facade/BabyNutritionSpecialtyFacade.java | 2 +- .../platform/operate/web/facade/BreastFacade.java | 2 +- .../operate/web/facade/CancerScreeningFacade.java | 2 +- .../platform/operate/web/facade/PatientFacade.java | 14 +- .../web/facade/PremaritalCheckupFacade.java | 6 +- .../operate/web/facade/Public2PathFacade.java | 2 +- .../platform/operate/web/facade/SmnFacade.java | 2 +- .../impl/BabyEvaluationCriterionServiceImpl.java | 4 +- .../web/service/impl/BabyEyeCheckServiceImpl.java | 4 +- .../web/service/impl/BloodPressureServiceImpl.java | 4 +- .../web/service/impl/BloodSugarServiceImpl.java | 2 +- .../web/service/impl/ReportServiceImpl.java | 4 +- .../web/service/impl/TrackDownServiceImpl.java | 4 +- .../operate/web/utils/BabyHiskCountTask.java | 2 +- .../operate/web/utils/BabyQhdHiskCountTask.java | 2 +- .../web/utils/HospitalCouponPrintUtils.java | 2 +- .../lyms/platform/operate/web/utils/MongoUtil.java | 2 +- .../operate/web/utils/PatientRelateMemberUtil.java | 2 +- 28 files changed, 144 insertions(+), 144 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index 829fa4d..fa72a01 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -101,10 +101,10 @@ public class BasicConfigServiceTest { mongoTemplate.getDb().slaveOk(); mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); PatientTicketIdDao patientTicketIdDao = (PatientTicketIdDao) applicationContext.getBean("patientTicketIdDao"); + /* System.out.println(patientTicketIdDao.nextId(BasicConfigServiceTest.class.getSimpleName())); System.out.println(patientTicketIdDao.nextId(BasicConfigServiceTest.class.getSimpleName())); System.out.println(patientTicketIdDao.nextId(BasicConfigServiceTest.class.getSimpleName())); - System.out.println(patientTicketIdDao.nextId(BasicConfigServiceTest.class.getSimpleName())); - System.out.println(patientTicketIdDao.nextId(BasicConfigServiceTest.class.getSimpleName())); + System.out.println(patientTicketIdDao.nextId(BasicConfigServiceTest.class.getSimpleName()));*/ } @@ -136,10 +136,10 @@ public class BasicConfigServiceTest { list.add(1000000001); groupsItems.sethId(list); groupsItems.setParentId("100002"); - System.out.println(groupsItemService.addOneEntity(groupsItems)); + // System.out.println(groupsItemService.addOneEntity(groupsItems)); OrganizationGroupsItemQuery groupsItemQuery = new OrganizationGroupsItemQuery(); List list1 = groupsItemService.queryList(groupsItemQuery); - System.out.println(list1.size()); + // System.out.println(list1.size()); } public static void changeLong2Time(ApplicationContext applicationContext) { @@ -218,7 +218,7 @@ public class BasicConfigServiceTest { try { List list = mongoTemplate.find(new Query(), DataPermissionsModel.class); for (DataPermissionsModel model : list) { - System.out.println(JsonUtil.obj2Str(model.getData().keySet())); + // System.out.println(JsonUtil.obj2Str(model.getData().keySet())); } } catch (Exception e) { e.printStackTrace(); @@ -242,7 +242,7 @@ public class BasicConfigServiceTest { for (BabyCheckModel model : list) { strs.add(Base64.encodeBase64String(SerializUtils.objToByte(model))); } - System.out.println(JsonUtil.array2JsonString(list)); + // System.out.println(JsonUtil.array2JsonString(list)); HttpClient client = new HttpClient(); client.getHttpConnectionManager().getParams().setConnectionTimeout(30000); client.getHttpConnectionManager().getParams().setSoTimeout(30000); @@ -255,8 +255,8 @@ public class BasicConfigServiceTest { client.executeMethod(post); int statusCode = post.getStatusCode(); String json = post.getResponseBodyAsString(); - System.out.println(i); - System.out.println(json); + /* System.out.println(i); + System.out.println(json);*/ post.releaseConnection(); if (200 == statusCode) { @@ -278,8 +278,8 @@ public class BasicConfigServiceTest { for (AssayConfig config : assayConfigList) { assayConfigMap.put(config.getProjectCode(), config); } - System.out.println(JsonUtil.obj2Str(assayConfigMap)); - System.out.println(JsonUtil.obj2Str(assayConfigMap.get("PLT"))); + /* System.out.println(JsonUtil.obj2Str(assayConfigMap)); + System.out.println(JsonUtil.obj2Str(assayConfigMap.get("PLT")));*/ } public static void saveHospitalMsgTemplate(ApplicationContext applicationContext) { @@ -291,7 +291,7 @@ public class BasicConfigServiceTest { query.setHospitalId("216"); query.setYn(1); List list = mongoTemplate.find(query.convertToQuery().convertToMongoQuery(), SmsTemplateModel.class); - System.out.println(JsonUtil.array2JsonString(list)); + // System.out.println(JsonUtil.array2JsonString(list)); HttpClient client = new HttpClient(); client.getHttpConnectionManager().getParams().setConnectionTimeout(10000); client.getHttpConnectionManager().getParams().setSoTimeout(10000); @@ -304,7 +304,7 @@ public class BasicConfigServiceTest { client.executeMethod(post); int statusCode = post.getStatusCode(); String json = post.getResponseBodyAsString(); - System.out.println(json); + /* System.out.println(json);*/ post.releaseConnection(); if (200 == statusCode) { @@ -323,7 +323,7 @@ public class BasicConfigServiceTest { query.setHospitalId("216"); query.setYn(1); List list = mongoTemplate.find(query.convertToQuery().convertToMongoQuery(), SmsConfigModel.class); - System.out.println(JsonUtil.array2JsonString(list)); + // System.out.println(JsonUtil.array2JsonString(list)); HttpClient client = new HttpClient(); client.getHttpConnectionManager().getParams().setConnectionTimeout(10000); client.getHttpConnectionManager().getParams().setSoTimeout(10000); @@ -336,7 +336,7 @@ public class BasicConfigServiceTest { client.executeMethod(post); int statusCode = post.getStatusCode(); String json = post.getResponseBodyAsString(); - System.out.println(json); + // System.out.println(json); post.releaseConnection(); if (200 == statusCode) { @@ -370,21 +370,21 @@ public class BasicConfigServiceTest { } } - System.out.println(); - System.out.println(); + /* System.out.println(); + System.out.println();*/ String classes[] = {"", "生化", "外送", "发光免疫", "血常规", "体液常规", "血凝", "艾滋", "免疫", "", "微生物", "其他", "脑脊液生化", "微量元素", "分泌物检测(BV)"}; for (String s : classes) { if (StringUtils.isNotBlank(s)) { MongoCondition condition = MongoCondition.newInstance("classify", s.trim(), MongoOper.IS); List assayConfigList = mongoTemplate.find(condition.toMongoQuery().convertToMongoQuery(), AssayConfig.class); - System.out.println(s); + //System.out.println(s); for (AssayConfig config : assayConfigList) { System.out.print(config.getProjectName()); System.out.print(" , "); } - System.out.println(); + // System.out.println(); } } @@ -420,7 +420,7 @@ public class BasicConfigServiceTest { config.setDesc(array[24].trim()); } - System.out.println(JsonUtil.obj2JsonString(config)); + // System.out.println(JsonUtil.obj2JsonString(config)); mongoTemplate.insert(config); } } @@ -450,7 +450,7 @@ public class BasicConfigServiceTest { config.setYn(1); - System.out.println(i + " == " + JsonUtil.obj2JsonString(config)); + // System.out.println(i + " == " + JsonUtil.obj2JsonString(config)); mongoTemplate.save(config); } } @@ -482,7 +482,7 @@ public class BasicConfigServiceTest { awModel.setPtwoDs(Double.valueOf(array[6])); awModel.setPthreeDs(Double.valueOf(array[7])); - System.out.println(i + " == " + JsonUtil.obj2JsonString(awModel)); + // System.out.println(i + " == " + JsonUtil.obj2JsonString(awModel)); mongoTemplate.save(awModel); AwModel awModel2 = new AwModel(); @@ -497,7 +497,7 @@ public class BasicConfigServiceTest { awModel2.setPtwoDs(Double.valueOf(array[15])); awModel2.setPthreeDs(Double.valueOf(array[16])); - System.out.println(i + " == " + JsonUtil.obj2JsonString(awModel2)); + // System.out.println(i + " == " + JsonUtil.obj2JsonString(awModel2)); mongoTemplate.save(awModel2); } } @@ -523,7 +523,7 @@ public class BasicConfigServiceTest { hwModel.setReduceSd(Double.valueOf(array[1])); hwModel.setMiddleSd(Double.valueOf(array[2])); hwModel.setPlusSd(Double.valueOf(array[3])); - System.out.println(i + " == " + JsonUtil.obj2JsonString(hwModel)); + // System.out.println(i + " == " + JsonUtil.obj2JsonString(hwModel)); mongoTemplate.save(hwModel); } } @@ -538,7 +538,7 @@ public class BasicConfigServiceTest { mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); Set set = mongoTemplate.getCollectionNames(); for (String s : set) { - System.out.println(s); + // System.out.println(s); } try { List list = FileUtils.readLines(new File("E:\\temp\\儿童指导意见.csv")); @@ -554,7 +554,7 @@ public class BasicConfigServiceTest { guidelines.setType(3); guidelines.setStart(Integer.valueOf(array[0])); guidelines.setEnd(guidelines.getStart()); - System.out.println(i + " == " + JsonUtil.obj2JsonString(guidelines)); + // System.out.println(i + " == " + JsonUtil.obj2JsonString(guidelines)); mongoTemplate.save(guidelines); } } @@ -569,7 +569,7 @@ public class BasicConfigServiceTest { mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); Set set = mongoTemplate.getCollectionNames(); for (String s : set) { - System.out.println(s); + // System.out.println(s); } try { List list = FileUtils.readLines(new File("E:\\temp\\孕产报告指导意见.csv")); @@ -626,7 +626,7 @@ public class BasicConfigServiceTest { } else { mongoTemplate.save(guidelines); } - System.out.println(i + " == " + JsonUtil.obj2JsonString(guidelines)); + // System.out.println(i + " == " + JsonUtil.obj2JsonString(guidelines)); } } } @@ -689,7 +689,7 @@ public class BasicConfigServiceTest { config.setCreateDate(new Date().getTime()); config.setParentId("57dc45f7-b0ba-42f0-863b-de53966a6e65"); mongoTemplate.save(config); - System.out.println(line); + // System.out.println(line); } } @@ -717,7 +717,7 @@ public class BasicConfigServiceTest { config.setCreateDate(new Date().getTime()); config.setParentId("4bc86dd6-2217-4a33-95f4-dc22ee70f2e3"); mongoTemplate.save(config); - System.out.println(line); + // System.out.println(line); } } @@ -752,7 +752,7 @@ public class BasicConfigServiceTest { awModel2.setPtwoDs(Double.valueOf(array[6])); awModel2.setPthreeDs(Double.valueOf(array[7])); - System.out.println(" == " + JsonUtil.obj2JsonString(awModel2)); + // System.out.println(" == " + JsonUtil.obj2JsonString(awModel2)); mongoTemplate.save(awModel2); } } @@ -901,7 +901,7 @@ public class BasicConfigServiceTest { } } } - System.out.println(model); + // System.out.println(model); mongoTemplate.save(model); } } @@ -1082,12 +1082,12 @@ public class BasicConfigServiceTest { try { wb = Workbook.getWorkbook(file); Sheet s = wb.getSheet(0); - System.out.println(s.getName() + " : "); + // System.out.println(s.getName() + " : "); int rows = s.getRows(); if (rows > 0) { //遍历每行 for (int i = 1; i < rows; i++) { - System.out.println("rows=" + i); + //System.out.println("rows=" + i); BloodSugarConfigModel model = new BloodSugarConfigModel(); // 1监测 2 教育和心里 3药物 4 饮食 5 运动 6 不同孕周的营养指南 model.setType(1); @@ -1123,13 +1123,13 @@ public class BasicConfigServiceTest { } Sheet s1 = wb.getSheet(1); - System.out.println(s1.getName() + " : "); + //System.out.println(s1.getName() + " : "); int rows1 = s1.getRows(); if (rows1 > 0) { //遍历每行 for (int i = 1; i < rows1; i++) { - System.out.println("rows=" + i); + //System.out.println("rows=" + i); BloodSugarConfigModel model = new BloodSugarConfigModel(); model.setType(2); Cell[] cells = s1.getRow(i); @@ -1161,13 +1161,13 @@ public class BasicConfigServiceTest { Sheet s2 = wb.getSheet(2); - System.out.println(s2.getName() + " : "); + // System.out.println(s2.getName() + " : "); int rows2 = s2.getRows(); if (rows2 > 0) { //遍历每行 for (int i = 1; i < rows2; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BloodSugarConfigModel model = new BloodSugarConfigModel(); model.setType(3); Cell[] cells = s2.getRow(i); @@ -1200,12 +1200,12 @@ public class BasicConfigServiceTest { Sheet s3 = wb.getSheet(3); - System.out.println(s3.getName() + " : "); + // System.out.println(s3.getName() + " : "); int rows3 = s3.getRows(); if (rows3 > 0) { //遍历每行 for (int i = 1; i < rows3; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BloodSugarConfigModel model = new BloodSugarConfigModel(); model.setType(4); Cell[] cells = s3.getRow(i); @@ -1237,12 +1237,12 @@ public class BasicConfigServiceTest { Sheet s4 = wb.getSheet(4); - System.out.println(s4.getName() + " : "); + // System.out.println(s4.getName() + " : "); int rows4 = s4.getRows(); if (rows4 > 0) { //遍历每行 for (int i = 1; i < rows4; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BloodSugarConfigModel model = new BloodSugarConfigModel(); model.setType(5); // 1监测 2 教育和心里 3药物 4 饮食 5 运动 6 不同孕周的营养指南 Cell[] cells = s4.getRow(i); @@ -1292,12 +1292,12 @@ public class BasicConfigServiceTest { Sheet s5 = wb.getSheet(5); - System.out.println(s5.getName() + " : "); + // System.out.println(s5.getName() + " : "); int rows5 = s5.getRows(); if (rows5 > 0) { //遍历每行 for (int i = 1; i < rows5; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BloodSugarConfigModel model = new BloodSugarConfigModel(); model.setType(6); Cell[] cells = s5.getRow(i); @@ -1426,7 +1426,7 @@ public class BasicConfigServiceTest { for (int j1 = 0; j1 < wb.getSheets().length; j1++) { Sheet s1 = wb.getSheet(j1); String type = map.get(s1.getName()); - System.out.println("sheet name -->>> type :" + map.get(s1.getName())); + // System.out.println("sheet name -->>> type :" + map.get(s1.getName())); if (null == type) { return; } @@ -1485,7 +1485,7 @@ public class BasicConfigServiceTest { pressureGuideModel.setCategoryType(map2.get(k[1])); pressureGuideModel.setWeek(Integer.valueOf(k[0])); pressureGuideModel.setContent(keyWord.getContent()); - System.out.println(pressureGuideModel); + //System.out.println(pressureGuideModel); // mongoTemplate.save(pressureGuideModel); } } @@ -1502,12 +1502,12 @@ public class BasicConfigServiceTest { try { wb = Workbook.getWorkbook(file); Sheet s = wb.getSheet(0); - System.out.println(s.getName() + " : "); + // System.out.println(s.getName() + " : "); int rows = s.getRows(); if (rows > 0) { //遍历每行 for (int i = 1; i < rows; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyConfigModel model = new BabyConfigModel(); //0 0-11月龄 1 0-11月热量计算 2 12-36月龄 3 12-35月热量计算 4.12--36喂养指南 5. 36月热量计算 model.setType(0); @@ -1551,13 +1551,13 @@ public class BasicConfigServiceTest { } Sheet s1 = wb.getSheet(1); - System.out.println(s1.getName() + " : "); + // System.out.println(s1.getName() + " : "); int rows1 = s1.getRows(); if (rows1 > 0) { //遍历每行 for (int i = 1; i < rows1; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyConfigModel model = new BabyConfigModel(); //0 0-11月龄 1 0-11月热量计算 2 12-36月龄 3 12-35月热量计算 4.12--36喂养指南 5. 36月热量计算 model.setType(1); @@ -1590,13 +1590,13 @@ public class BasicConfigServiceTest { Sheet s2 = wb.getSheet(2); - System.out.println(s2.getName() + " : "); + // System.out.println(s2.getName() + " : "); int rows2 = s2.getRows(); if (rows2 > 0) { //遍历每行 for (int i = 1; i < rows2; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyConfigModel model = new BabyConfigModel(); //0 0-11月龄 1 0-11月热量计算 2 12-36月龄 3 12-35月热量计算 4.12--36喂养指南 5. 36月热量计算 model.setType(2); @@ -1629,12 +1629,12 @@ public class BasicConfigServiceTest { Sheet s3 = wb.getSheet(3); - System.out.println(s3.getName() + " : "); + // System.out.println(s3.getName() + " : "); int rows3 = s3.getRows(); if (rows3 > 0) { //遍历每行 for (int i = 1; i < rows3; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyConfigModel model = new BabyConfigModel(); //0 0-11月龄 1 0-11月热量计算 2 12-36月龄 3 12-35月热量计算 4.12--36喂养指南 5. 36月热量计算 model.setType(3); @@ -1669,12 +1669,12 @@ public class BasicConfigServiceTest { Sheet s4 = wb.getSheet(4); - System.out.println(s4.getName() + " : "); + // System.out.println(s4.getName() + " : "); int rows4 = s4.getRows(); if (rows3 > 0) { //遍历每行 for (int i = 1; i < rows4; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyConfigModel model = new BabyConfigModel(); //0 0-11月龄 1 0-11月热量计算 2 12-36月龄 3 12-35月热量计算 4.12--36喂养指南 5. 36月热量计算 model.setType(4); @@ -1709,12 +1709,12 @@ public class BasicConfigServiceTest { Sheet s5 = wb.getSheet(5); - System.out.println(s5.getName() + " : "); + // System.out.println(s5.getName() + " : "); int rows5 = s5.getRows(); if (rows5 > 0) { //遍历每行 for (int i = 1; i < rows5; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyConfigModel model = new BabyConfigModel(); //0 0-11月龄 1 0-11月热量计算 2 12-36月龄 3 12-35月热量计算 4.12--36喂养指南 5. 36月热量计算 model.setType(5); @@ -1767,12 +1767,12 @@ public class BasicConfigServiceTest { try { wb = Workbook.getWorkbook(file); Sheet s = wb.getSheet(0); - System.out.println(s.getName() + " : "); + // System.out.println(s.getName() + " : "); int rows = s.getRows(); if (rows > 0) { //遍历每行 for (int i = 1; i < rows; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 model.setType(0); @@ -1809,13 +1809,13 @@ public class BasicConfigServiceTest { } Sheet s1 = wb.getSheet(1); - System.out.println(s1.getName() + " : "); + // System.out.println(s1.getName() + " : "); int rows1 = s1.getRows(); if (rows1 > 0) { //遍历每行 for (int i = 1; i < rows1; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 model.setType(1); @@ -1845,13 +1845,13 @@ public class BasicConfigServiceTest { Sheet s2 = wb.getSheet(2); - System.out.println(s2.getName() + " : "); + // System.out.println(s2.getName() + " : "); int rows2 = s2.getRows(); if (rows2 > 0) { //遍历每行 for (int i = 1; i < rows2; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 model.setType(2); @@ -1884,12 +1884,12 @@ public class BasicConfigServiceTest { Sheet s3 = wb.getSheet(3); - System.out.println(s3.getName() + " : "); + // System.out.println(s3.getName() + " : "); int rows3 = s3.getRows(); if (rows3 > 0) { //遍历每行 for (int i = 1; i < rows3; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 model.setType(3); @@ -1930,12 +1930,12 @@ public class BasicConfigServiceTest { Sheet s4 = wb.getSheet(4); - System.out.println(s4.getName() + " : "); + // System.out.println(s4.getName() + " : "); int rows4 = s4.getRows(); if (rows3 > 0) { //遍历每行 for (int i = 1; i < rows4; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 model.setType(4); @@ -1974,12 +1974,12 @@ public class BasicConfigServiceTest { Sheet s5 = wb.getSheet(5); - System.out.println(s5.getName() + " : "); + // System.out.println(s5.getName() + " : "); int rows5 = s5.getRows(); if (rows5 > 0) { //遍历每行 for (int i = 1; i < rows5; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 model.setType(5); @@ -2019,12 +2019,12 @@ public class BasicConfigServiceTest { Sheet s6 = wb.getSheet(6); - System.out.println(s6.getName() + " : "); + // System.out.println(s6.getName() + " : "); int rows6 = s6.getRows(); if (rows6 > 0) { //遍历每行 for (int i = 1; i < rows6; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 6 6-11辅食添加 model.setType(6); @@ -2061,12 +2061,12 @@ public class BasicConfigServiceTest { Sheet s7 = wb.getSheet(7); - System.out.println(s7.getName() + " : "); + // System.out.println(s7.getName() + " : "); int rows7 = s7.getRows(); if (rows7 > 0) { //遍历每行 for (int i = 1; i < rows7; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 6 6-11辅食添加 7 12-36元素文章 model.setType(7); @@ -2116,12 +2116,12 @@ public class BasicConfigServiceTest { Sheet s = wb.getSheet(0); - System.out.println(s.getName() + " : "); + // System.out.println(s.getName() + " : "); int rows = s.getRows(); if (rows > 0) { //遍历每行 for (int i = 1; i < rows; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); XyPresentationModel xyModel = new XyPresentationModel(); //0 健康教育之孕期相关 1 饮食 2 饮食之营养指南 3 运动 xyModel.setType(0); @@ -2155,11 +2155,11 @@ public class BasicConfigServiceTest { } Sheet s1 = wb.getSheet(1); - System.out.println(s.getName() + " : "); + // System.out.println(s.getName() + " : "); int rows1 = s1.getRows(); if (rows1 > 0) { for (int i = 1; i < rows1; i++) { - System.out.println("rows=" + i); + // System.out.println("rows=" + i); XyPresentationModel xyModel = new XyPresentationModel(); //0 健康教育之孕期相关 1 饮食 2 饮食之营养指南 3 运动 xyModel.setType(1); @@ -2214,7 +2214,7 @@ public class BasicConfigServiceTest { } Sheet s2 = wb.getSheet(2); - System.out.println(s2.getName() + " : "); + // System.out.println(s2.getName() + " : "); int rows2 = s2.getRows(); if (rows2 > 0) { //遍历每行 diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 75902a1..f5b50d6 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -254,7 +254,7 @@ public class CouponServiceImpl implements CouponService { AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); antExRecordQuery.setPid(co.getUserId()); antExRecordQuery.setBarCode(co.getSequenceId()); - System.out.println("优惠券使用脏数据SQL:"+antExRecordQuery.convertToQuery().convertToMongoQuery()); + // System.out.println("优惠券使用脏数据SQL:"+antExRecordQuery.convertToQuery().convertToMongoQuery()); List antExRecordModels = antExRecordService.queryAntExRecords(antExRecordQuery); System.out.println(co.getUserId()+"：按条件查询结果："+antExRecordModels.size()); if (CollectionUtils.isNotEmpty(antExRecordModels)) { diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java index b9cafd2..a9d4106 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java @@ -80,7 +80,7 @@ public class RisServiceImpl implements RisService { model.setItem_finding(model.getItem_finding().trim()); model.setItem_diagnosis(model.getItem_diagnosis().trim()); model.setItem_json(JsonUtil.array2JsonString(model.getItem_json())); - System.out.println("resivce = " + model.toString()); + // System.out.println("resivce = " + model.toString()); // masterRisMapper.deleteRisData(model); masterRisMapper.saveRisData(model); } catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsDataUtil.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsDataUtil.java index 5c4d77b..ed76866 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsDataUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsDataUtil.java @@ -27,7 +27,7 @@ public class HsDataUtil { for (Map map : listEmp) { employees.put(getString(map.get("E_ID")), getString(map.get("E_CODE"))); } - System.out.println("employees------" + employees.size()); + // System.out.println("employees------" + employees.size()); List> datacontentsList = JDBCUtil.getOracleListDataBySql("SELECT DC_NAME,DC_ID FROM PLAT_DATACONTENT "); @@ -35,14 +35,14 @@ public class HsDataUtil { datacontents.put(getString(map.get("DC_ID")), getString(map.get("DC_NAME"))); } - System.out.println("datacontents------" + datacontents.size()); + // System.out.println("datacontents------" + datacontents.size()); List> orcleHospsList = JDBCUtil.getOracleListDataBySql("SELECT H_NAME,H_ID FROM PLAT_HOSPITAL H"); for (Map map : orcleHospsList) { oracleHosps.put(getString(map.get("H_ID")), getString(map.get("H_NAME"))); } - System.out.println("oracleHosps------" + oracleHosps.size()); + // System.out.println("oracleHosps------" + oracleHosps.size()); @@ -50,14 +50,14 @@ public class HsDataUtil { for (Map map : mysqlHospsList) { mysqlHosps.put(getString(map.get("name")), getString(map.get("id"))); } - System.out.println("mysqlHosps------" + mysqlHosps.size()); + // System.out.println("mysqlHosps------" + mysqlHosps.size()); List> usersList = JDBCUtil.getMysqlListDataBySql("select u.id,u.name,u.account,u.org_id from users u left join organization o on u.org_id = o.id where o.city_id=12 "); for (Map map : usersList) { users.put(getString(map.get("account")), getString(map.get("id"))); } - System.out.println("users------" + users.size()); + //System.out.println("users------" + users.size()); Query query = new Query(); @@ -65,7 +65,7 @@ public class HsDataUtil { for (BasicConfig config : basicLists) { basicConfigs.put(config.getName()+config.getParentId(), config.getId()); } - System.out.println("basicConfigs------" + basicConfigs.size()); + // System.out.println("basicConfigs------" + basicConfigs.size()); } public static String getEmpNameById(String id) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java index a9ea88b..6b548e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java @@ -105,7 +105,7 @@ public class HsfyFmService { Date start = new Date(end.getTime()-1000*60*60*2); String startStr = fmt.format(start); String endStr = fmt.format(end); - System.out.println("start=" + startStr + "end=" + endStr); + // System.out.println("start=" + startStr + "end=" + endStr); queryFmPatient(startStr, endStr, null); } @@ -185,7 +185,7 @@ public class HsfyFmService { if(CollectionUtils.isNotEmpty(list)){ for(HsFm fm:list){ - System.out.println("fm=" + fm.toString()); + // System.out.println("fm=" + fm.toString()); int a = 0;//用来判断是否建了儿童档案，如果建了儿童档案就不保存分娩记录 int count = 0; List users = new ArrayList(); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/SyncHsPatientService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/SyncHsPatientService.java index d8f3ec0..bc1b70d 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/SyncHsPatientService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/SyncHsPatientService.java @@ -58,7 +58,7 @@ public class SyncHsPatientService { " left join Plat_Patient pp on mp.p_platpatientid = pp.p_id left join (select max(VC_OPERTIME) as OPERTIME, " + " VC_CARDNO, VC_PATIENTNO from MOMMY_VISITCARD group by VC_CARDNO, VC_PATIENTNO) vc " + " on vc.VC_PATIENTNO = mp.P_NO where mp.P_FILINGTIME >= to_date('"+startDate+"','yyyy-MM-dd') AND mp.P_FILINGTIME <= to_date('"+endDate+"','yyyy-MM-dd') order by mp.P_FILINGTIME asc) temp where ROWNUM <="+pageEnd+") pat where pat.rowno >= "+pageStart; - System.out.println(sql); + // System.out.println(sql); List> list = JDBCUtil.getOracleListDataBySql(sql); if (!CollectionUtils.isNotEmpty(list)) { @@ -619,11 +619,11 @@ public class SyncHsPatientService { } mongoTemplate.save(antExChuModel); - System.out.println("初诊创建完成" + antExChuModel.getId()); + // System.out.println("初诊创建完成" + antExChuModel.getId()); AntExRecordModel antExRecordModel = convert(antExChuModel, patients); mongoTemplate.save(antExRecordModel); - System.out.println("创建产检记录完成"+ antExRecordModel.getId()); + // System.out.println("创建产检记录完成"+ antExRecordModel.getId()); } }catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index f1e01ef..707d672 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -87,7 +87,7 @@ public class LhxfyService { public Map getBabyLisInfo(String cardNo) { Map data = new HashMap<>(); List lisReportModels = getLhxfyLis(cardNo); - System.out.println("getBabyLisInfo=" + lisReportModels.size()); + // System.out.println("getBabyLisInfo=" + lisReportModels.size()); if (CollectionUtils.isNotEmpty(lisReportModels)) { for (LisReportModel model : lisReportModels) { List itemModels = model.getItems(); @@ -155,13 +155,13 @@ public class LhxfyService { // MongoCondition con2 = MongoCondition.newInstance("isUploadingProvince",false, MongoOper.EXISTS); // query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); - System.out.println(query.toString()); + // System.out.println(query.toString()); List preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); - System.out.println("autoInLis=" + preEugenicsBaseModels.size()); + // System.out.println("autoInLis=" + preEugenicsBaseModels.size()); if (CollectionUtils.isNotEmpty(preEugenicsBaseModels)) { for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) { - System.out.println("autoInLis WifeCardNo=" + preEugenicsBaseModel.getWifeCardNo()); + // System.out.println("autoInLis WifeCardNo=" + preEugenicsBaseModel.getWifeCardNo()); //查询妻子的lis //白带检查 // List bdjc = new ArrayList<>(8); @@ -184,7 +184,7 @@ public class LhxfyService { } List lisReportModels = getLhxfyLis(preEugenicsBaseModel.getWifeCardNo()); - System.out.println("lisReportModels=" + lisReportModels.size()); + //System.out.println("lisReportModels=" + lisReportModels.size()); if (CollectionUtils.isNotEmpty(lisReportModels)) { for (LisReportModel model : lisReportModels) { @@ -195,10 +195,10 @@ public class LhxfyService { wifeClinicalCheck.put("doctor", 2100006234); wifeClinicalCheck.put("doctorStr", "张洪英"); - System.out.println("LisReportModel=" + model.getLisId()); + // System.out.println("LisReportModel=" + model.getLisId()); List itemModels = model.getItems(); if (CollectionUtils.isNotEmpty(itemModels)) { - System.out.println("itemModels=" + itemModels.size()); + // System.out.println("itemModels=" + itemModels.size()); for (LisReportItemModel itemModel : itemModels) { String code = itemModel.getCode(); String result = itemModel.getResult(); @@ -454,7 +454,7 @@ public class LhxfyService { husbandClinicalCheck = new HashMap<>(); } - System.out.println("autoInLis husbandCardNo=" + preEugenicsBaseModel.getHusbandCardNo()); + // System.out.println("autoInLis husbandCardNo=" + preEugenicsBaseModel.getHusbandCardNo()); List hlisReportModels = getLhxfyLis(preEugenicsBaseModel.getHusbandCardNo()); if (CollectionUtils.isNotEmpty(hlisReportModels)) { for (LisReportModel model : hlisReportModels) { @@ -863,7 +863,7 @@ public class LhxfyService { Query query2 = Query.query(Criteria.where("id").is(premaritalCheckup.getId())); Update update2 = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(premaritalCheckup)); - System.out.println(premaritalCheckup.getId()); + // System.out.println(premaritalCheckup.getId()); mongoTemplate.updateFirst(query2, update2, PremaritalCheckup.class); } } @@ -908,9 +908,9 @@ public class LhxfyService { data.put("phoneNumber", model.getHusbandPhone()); data.put("deviceNum", "管理员"); String husbandJson = JsonUtil.obj2Str(data); - System.out.println("HusbandJson=" + husbandJson); + // System.out.println("HusbandJson=" + husbandJson); String husbandResult = HttpClientUtil.doWebServicePost(LHFY_HIS_URL, husbandJson); - System.out.println("husbandResult=" + husbandResult); + // System.out.println("husbandResult=" + husbandResult); model.setHusbandBlNum(getPatientId(husbandResult)); data = new HashMap<>(); @@ -926,9 +926,9 @@ public class LhxfyService { data.put("phoneNumber", model.getWifePhone()); data.put("deviceNum", "管理员"); String json = JsonUtil.obj2Str(data); - System.out.println("wifeJson=" + json); + // System.out.println("wifeJson=" + json); String wifeResult = HttpClientUtil.doWebServicePost(LHFY_HIS_URL, json); - System.out.println("wifeResult=" + wifeResult); + // System.out.println("wifeResult=" + wifeResult); model.setWifeBlNum(getPatientId(wifeResult)); Query query1 = Query.query(Criteria.where("id").is(model.getId())); @@ -962,9 +962,9 @@ public class LhxfyService { data.put("phoneNumber", model.getPhone()); data.put("deviceNum", "管理员"); String json = JsonUtil.obj2Str(data); - System.out.println("residentsJson=" + json); + // System.out.println("residentsJson=" + json); String residentsResult = HttpClientUtil.doWebServicePost(LHFY_HIS_URL, json); - System.out.println("residentsResult=" + residentsResult); + // System.out.println("residentsResult=" + residentsResult); model.setBlNum(getPatientId(residentsResult)); residentsArchiveService.updateResident(model, model.getId()); @@ -1548,7 +1548,7 @@ public class LhxfyService { Date endDate1 = new Date(); Query query = Query.query(Criteria.where("hospitalId").is("2100001605") .and("wifeBCheck").exists(true).and("fillDate").gte(startDate1).lte(endDate1)); - System.out.println("=============" + query.toString()); + // System.out.println("=============" + query.toString()); List modelList = mongoTemplate.find(query, PreEugenicsBaseModel.class); if (CollectionUtils.isNotEmpty(modelList)) { System.out.println("size===" + modelList.size()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java index 1c893f2..f371d48 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java @@ -107,7 +107,7 @@ public class AnnualReportFacade { List> mapList = this.getDates(map, organizationService, time, babyService, matDeliverService, antExRecordService, antenatalExaminationService, sieveService, matDeliverFollowService, patientsService, mongoTemplate); - System.out.println("mapList=" + mapList); + // System.out.println("mapList=" + mapList); this.sum(mapList); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("年报表.xls").getBytes("UTF-8"), "ISO-8859-1")); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutismDiagnoseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutismDiagnoseFacade.java index feb840e..f1d2366 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutismDiagnoseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutismDiagnoseFacade.java @@ -403,7 +403,7 @@ public class BabyAutismDiagnoseFacade extends BaseServiceImpl { //babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId, false)); // - System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); + // System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); List models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); if (CollectionUtils.isNotEmpty(models)) { @@ -718,7 +718,7 @@ public class BabyAutismDiagnoseFacade extends BaseServiceImpl { babySpecialDiseaseClinicModels = babyAutismDiagnoseServer.queryBabyBabyAutismDiagnoseRecord(babyQuery); - System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); + // System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } for (int i = 0; i < babySpecialDiseaseClinicModels.size(); i++) { BabyAutismDiagnoseModel babySpecialDiseaseClinicModel = babySpecialDiseaseClinicModels.get(i); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java index 90f11f6..5f9c1db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java @@ -172,7 +172,7 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码 babyQuery.setHospitalId(hospitalId); - System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); + // System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if (CollectionUtils.isNotEmpty(models)) { BabyModel babyModel = models.get(0); @@ -438,7 +438,7 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl { babyQuery2.setPhon(babyQuery.getPhon()); babyQuery2.setParentId(babyQuery.getId()); babyQuery2.setSort("checkDate"); - System.out.println(babyQuery2.convertToQuery().convertToMongoQuery()); + //System.out.println(babyQuery2.convertToQuery().convertToMongoQuery()); List babyKindergartenCheckModelList = babyKindergartenCheckService.queryOne(babyQuery2); for (int i = 0; i < babyKindergartenCheckModelList.size(); i++) { @@ -502,7 +502,7 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl { } babyKindergartenCheckModelList = babyKindergartenCheckService.queryAll(babyQuery); - System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); + // System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); for (int i = 0; i < babyKindergartenCheckModelList.size(); i++) { BabyKindergartenCheckModel babyKindergartenCheckModel = babyKindergartenCheckModelList.get(i); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java index 469eaf1..ab5af1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java @@ -422,7 +422,7 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { babyNutritionSpecialtyModelList = babyBabyNSService.queryAll(babyQuery); - System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); + // System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } for (int i = 0; i < babyNutritionSpecialtyModelList.size(); i++) { BabyNutritionSpecialtyModel babyNutritionSpecialtyModel = babyNutritionSpecialtyModelList.get(i); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java index ca2fc24..958bdd6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java @@ -409,7 +409,7 @@ public class BreastFacade extends BaseServiceImpl { } breastModelList = breastService.queryAll(babyQuery); - System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); + // System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } for (int i = 0; i < breastModelList.size(); i++) { BreastModel breastModel = breastModelList.get(i); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index e68175b..1d09650 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -740,7 +740,7 @@ public class CancerScreeningFacade { model.setIsSync(2); String json = JsonUtil.obj2Str1(model); String syncRsult = HttpClientUtil.doPostSSL("https://area-chengde-api.healthbaby.com.cn:12356/cancerScr/syncCancerScreen", json); - System.out.println(syncRsult); + // System.out.println(syncRsult); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 5e9ae34..ebb7403 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -738,11 +738,11 @@ public class PatientFacade extends BaseServiceImpl { riskPatientsQueryRequest.setSort("6");//按分娩时间排序 riskPatientsQueryRequest.setOrder("1");//降序 //以前逻辑 - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); } stopWatch.stop(); - logger.info(stopWatch.toString()); + // logger.info(stopWatch.toString()); List data = new ArrayList (); if (CollectionUtils.isNotEmpty(patientses)) { //如果是查高危孕妇 @@ -804,8 +804,8 @@ public class PatientFacade extends BaseServiceImpl { criteria.and("type").is(Integer.parseInt(riskPatientsQueryRequest.getType())); } - System.out.println(riskPatientsQueryRequest.getBuildDate()); - System.out.println(riskPatientsQueryRequest.getBmi()); + /* System.out.println(riskPatientsQueryRequest.getBuildDate()); + System.out.println(riskPatientsQueryRequest.getBmi());*/ //根据建档时间查询 if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildDate())) { //根据建档时间查询整理传来的时间 @@ -830,7 +830,7 @@ public class PatientFacade extends BaseServiceImpl { } Query query = Query.query(criteria); - System.out.println("------"+query.toString()); + // System.out.println("------"+query.toString()); String formatBmi = ""; if ("1".equals(riskPatientsQueryRequest.getBmi())) { formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "25", "28"); @@ -3314,7 +3314,7 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setDueStatus(null==patientManagerRequest.getDueStatus() ? null : patientManagerRequest.getDueStatus()); patientsQuery.setType(patientManagerRequest.getType()); patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode()); - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); List patientsList = patientsService.queryPatient(patientsQuery); List patientManagerQueryModelList = new ArrayList <>(); if (CollectionUtils.isNotEmpty(patientsList)) { @@ -4136,7 +4136,7 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setNextCheckTimeNe(false); } } - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); List temp = patientsService.queryPatientAnxtchuCount(patientsQuery); List> datas = new ArrayList<>(); if (CollectionUtils.isNotEmpty(temp)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index f63b10d..104a61b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -605,7 +605,7 @@ public class PremaritalCheckupFacade { if (parentIds != null) { query.setParentIds(parentIds); } - System.out.println(query.convertToQuery().convertToMongoQuery()); + // System.out.println(query.convertToQuery().convertToMongoQuery()); List data = premaritalCheckupService.queryPremaritalCheckup(query); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(data)) { @@ -1248,7 +1248,7 @@ public class PremaritalCheckupFacade { } } query.setHospitalId(hospital); - System.out.println("lhexport " + query.convertToQuery().convertToMongoQuery()); + // System.out.println("lhexport " + query.convertToQuery().convertToMongoQuery()); List data = premaritalCheckupService.queryPremaritalCheckup(query); if (CollectionUtils.isNotEmpty(data)) { lhxfyExport(out, list, data, response); @@ -3313,7 +3313,7 @@ public class PremaritalCheckupFacade { if(syncRsult != null) { premaritalCheckupService.updatePremaritalCheckup(model, model.getId()); - System.out.println("doSyncPremaritalCheckup=" + syncRsult); + // System.out.println("doSyncPremaritalCheckup=" + syncRsult); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/Public2PathFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/Public2PathFacade.java index ae27d90..4d97c6e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/Public2PathFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/Public2PathFacade.java @@ -85,7 +85,7 @@ public class Public2PathFacade { headers.put("partner-license","zuMEenBpJFPTx+x7Kd+gotbTo+tVvlkPwvd6i0U0rO0pasjnbgBTEq2dPDI52276CFxgTT+N84EOp4+4P0jcwrhRyRM1gYiZiC2952JWZTwEu7ONwcXNS0FkmFAwkQ0M-0Xdumz"); headers.put("access_token",getLoginToken().get("access_token")); String result = repeatPost(url,jsonString,headers); - System.out.println("saveChildInfo result "+result); + // System.out.println("saveChildInfo result "+result); } catch (Exception e) { ExceptionUtils.catchException("saveChildInfo error."); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java index 120c665..60e85ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java @@ -364,7 +364,7 @@ public class SmnFacade { query.with(new Sort(Sort.Direction.DESC, "created")); } - System.out.println(query.toString()); + // System.out.println(query.toString()); long count = mongoTemplate.count(query, SmnModel.class); param.mysqlBuild((int) count); query.skip(param.getOffset()).limit(param.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java index 5f00ac4..1b77378 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java @@ -772,7 +772,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri public void updateBabyCheck(String babyId) { if (StringUtils.isNotEmpty(babyId)) { - System.out.println("baby=" + babyId); + // System.out.println("baby=" + babyId); Date firstSecond = DateUtil.getDayFirstSecond(new Date()); Date dayLastSecond = DateUtil.getDayLastSecond(new Date()); List babyCheckModels = mongoTemplate.find(Query.query(Criteria.where("buildId").is(babyId) @@ -807,7 +807,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri checkModel.setOkSize(model2s.get(0).getOkSize());//运动神经筛查 checkModel.setAbnormalSize(babyEyeCheckService.getExcItems(model2s.get(0)));//运动神经筛查异常项 } - System.out.println("BabyCheckModel=" + checkModel.toString()); + // System.out.println("BabyCheckModel=" + checkModel.toString()); babyCheckService.updateBabyCheck(checkModel,checkModel.getId()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 208975c..bb2d364 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -394,7 +394,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (CollectionUtils.isNotEmpty(babyCheckModels)) { BabyCheckModel checkModel = babyCheckModels.get(0); - System.out.println("BabyCheckModel="+checkModel.toString()); + // System.out.println("BabyCheckModel="+checkModel.toString()); checkModel.setEyeAppearance(babyEyeCheck.getEyeAppearance()); checkModel.setEyeRedReflex(babyEyeCheck.getRedReflexQhd()); checkModel.setEyeDioptroscopy(babyEyeCheck.getRefractiveScreening()); @@ -1288,7 +1288,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyModelQuery.setLimit(limit); babyModelQuery.setYn(YnEnums.YES.getId()); List babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "checkTime", Sort.Direction.DESC); - System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery()); + // System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery()); List results = new ArrayList<>(); for (BabyModel babyModel : babyModelList) { Map mapResult = new HashMap(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index d48bf60..e4dbf34 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -434,7 +434,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP JSONArray array = JSONArray.parseArray(bloods.get("datas")); for (Object obj : array) { JSONObject jsonObject = (JSONObject) obj; - System.out.println(jsonObject); + // System.out.println(jsonObject); } return RespBuilder.buildSuccess(); } @@ -730,7 +730,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP if (StringUtils.isNotEmpty(bloodPressure.getParentId()) && StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) ) { Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodPressure.getParentId())), Patients.class); Integer weeks = DateUtil.getWeek(patients.getLastMenses(), bloodPressure.getModified()); - System.out.println("孕周：" + weeks); + // System.out.println("孕周：" + weeks); Map paMap = new HashMap(); paMap.put("vcCardNo", patients.getVcCardNo()); paMap.put("username", patients.getUsername()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index d55a2c2..2c53665 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -334,7 +334,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga JSONArray array = JSONArray.parseArray(bloods.get("datas")); for (Object obj : array) { JSONObject jsonObject = (JSONObject) obj; - System.out.println(jsonObject); + // System.out.println(jsonObject); } return RespBuilder.buildSuccess(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index aae1427..8ab27de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1307,7 +1307,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1)); } Query query = Query.query(c); - System.out.println(query.toString()); + // System.out.println(query.toString()); List patients = mongoTemplate.find(query, Patients.class); doFilter(patients, ageType, patientType,startAge,endAge,startWeek,endWeek,hospitalId); return patients; @@ -3670,7 +3670,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .lt(DateUtil.getNextYearDate(year)) .and("hospitalId").is(hospitalId).and("yn").is(1) .and("enable").nin(Arrays.asList(1,2)).and("buildType").ne(1); - System.out.println(Query.query(criteria).toString()); + // System.out.println(Query.query(criteria).toString()); if (StringUtils.isNotEmpty(provinceId)) { criteria.and("provinceRegisterId").in(CollectionUtils.asList(provinceId)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 60c9aae..da1f9fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -107,7 +107,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS query.setFollowupStatus(followupStatus); //妇女建档主数据 List modelList = residentsArchiveService.queryResident(query); - System.out.println("---------" + query.convertToQuery().convertToMongoQuery().toString()); + // System.out.println("---------" + query.convertToQuery().convertToMongoQuery().toString()); // StopWatch stopWatch = new StopWatch("妇女建档主数据"); //优化前 // stopWatch.start("妇女建档优化前"); @@ -185,7 +185,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS stopWatch.start("孕妇建档优化后"); restList = dispPatient(patientsList, hospitalId, encryption); stopWatch.stop(); - System.out.println(stopWatch.toString()); + // System.out.println(stopWatch.toString()); archiveModelCount = patientsQuery.getCount(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java index 0d6cfcc..59cca3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java @@ -63,7 +63,7 @@ public class BabyHiskCountTask implements Callable { babyModelQuery.setWeakSonInfo(config.getId()); } int riskPatientCount = babyService.queryBabyCount(babyModelQuery); - System.out.println("name:" + config.getName() + ",riskPatientCount:" + riskPatientCount); + // System.out.println("name:" + config.getName() + ",riskPatientCount:" + riskPatientCount); RiskReportResult risk = new RiskReportResult(); risk.setHighRiskId(config.getId()); risk.setHighRisk(config.getName()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyQhdHiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyQhdHiskCountTask.java index 0d1d070..b1cbf57 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyQhdHiskCountTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyQhdHiskCountTask.java @@ -61,7 +61,7 @@ public class BabyQhdHiskCountTask implements Callable { babyModelQuery.setWeakSonInfo(config.getId()); } int riskPatientCount = babyService.queryBabyCount(babyModelQuery); - System.out.println("name:" + config.getName() + ",riskPatientCount:" + riskPatientCount); + // System.out.println("name:" + config.getName() + ",riskPatientCount:" + riskPatientCount); RiskReportResult risk = new RiskReportResult(); risk.setHighRiskId(config.getId()); risk.setHighRisk(config.getName()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java index 72dd6a8..c657bd0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java @@ -60,7 +60,7 @@ public class HospitalCouponPrintUtils { params.put("YE",YE.toString()); String result = HttpClientUtil.doPost(DJQ_URL, params, "UTF-8"); - System.out.println("result== "+result); + // System.out.println("result== "+result); return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index e78e80d..e2890e1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -173,7 +173,7 @@ public class MongoUtil { } Query query = new BasicQuery(dbObject, fieldObject); query.addCriteria(criteria); - System.out.println(query.toString()); + // System.out.println(query.toString()); List list = mongoTemplate.find(query, clazz); return list; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PatientRelateMemberUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PatientRelateMemberUtil.java index af19ce5..9027939 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PatientRelateMemberUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PatientRelateMemberUtil.java @@ -35,7 +35,7 @@ public class PatientRelateMemberUtil { String result = new String(get.getResponseBodyAsString()); - System.out.println("result:" + result); + // System.out.println("result:" + result); get.releaseConnection(); if (result != null && result.indexOf("成功") > 0) { -- 1.8.3.1