From a3b943f81636d4382d273ee5d3aca96f2da819e3 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Mon, 26 Feb 2024 14:51:47 +0800 Subject: [PATCH] =?UTF-8?q?#=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=AD=95=E5=91=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/master/ProjectWeekMapper.java | 2 ++ .../permission/service/ProjectWeekService.java | 1 + .../service/impl/ProjectWeekServiceImpl.java | 5 +++++ .../resources/mainOrm/master/ProjectWeekMapper.xml | 10 ++++++++++ .../com/lyms/platform/common/utils/StringUtils.java | 21 ++++++++++++--------- .../web/controller/FactorProjectController.java | 3 +-- .../operate/web/facade/BookbuildingFacade.java | 15 +++++++-------- 7 files changed, 38 insertions(+), 19 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java index 3858071..fd57de6 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.dao.master; import com.lyms.platform.permission.model.ProjectWeekEntity; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,4 +11,5 @@ public interface ProjectWeekMapper { void update(ProjectWeekEntity factorProject); void del(Integer id); ProjectWeekEntity selectById(Integer id); + String selectByWeek(@Param("hospitalId") Integer hospitalId, @Param("week")String week); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java index da0ed1d..ea4bff6 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java @@ -7,6 +7,7 @@ import java.util.List; public interface ProjectWeekService { List getList(Integer hospitalId); ProjectWeekEntity selectInfo(Integer id); + String selectByWeek(Integer hospitalId,String week); void add(ProjectWeekEntity projectWay); void update(ProjectWeekEntity projectWay); void del(Integer id); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java index 398a900..464239e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java @@ -23,6 +23,11 @@ public class ProjectWeekServiceImpl implements ProjectWeekService { } @Override + public String selectByWeek(Integer hospitalId,String week) { + return projectWeekMapper.selectByWeek(hospitalId,week); + } + + @Override public void add(ProjectWeekEntity projectWay) { projectWeekMapper.add(projectWay); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml index a816d10..46af263 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml @@ -55,4 +55,14 @@ id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index f9ef86f..9a25592 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -92,21 +92,24 @@ public final class StringUtils { */ public static boolean hasSameCharacters(String str1,String str2){ boolean hasSameCharacters = false; - str1=str1.replace(",",""); - str2=str2.replace(",",""); - for (int i = 0; i < str1.length(); i++) { - char c = str1.charAt(i); - - if (str2.indexOf(c) != -1) { // 若str2包含该字符则说明存在相同的字符 - hasSameCharacters = true; - break; + String [] array1=str1.split(","); + String [] array2=str2.split(","); + for (int i = 0,j=array1.length; i < j; i++) { + String a=array1[i]; + for (int k = 0,l=array2.length; k < l; k++) { + String b= array2[k]; + if (a.equals(b)){ // 若str2包含该字符则说明存在相同的字符 + hasSameCharacters = true; + break; + } } + } return hasSameCharacters; } public static void main(String[] args) { - System.out.println((hasSameCharacters("1","3,4,5,6,7"))); + System.out.println((hasSameCharacters("15,16,17","18,19,20,21"))); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java index 0dbe50e..ea1749c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.ProjectWeekEnums; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.BookbuildingFacade; @@ -146,7 +145,7 @@ public class FactorProjectController extends BaseController { ResultUtils.buildParameterErrorResultAndWrite(response, "孕周不能为空"); } if (type!=null){ - week=ProjectWeekEnums.getWeekName(week); + week=projectWeekService.selectByWeek(hospitalId,week); } FactorProjectEntity factorProject= factorProjectService.selectByWeek(hospitalId,week); ResultUtils.buildSuccessResultAndWrite(response,factorProject); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 4dd7fa0..96d8fd4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -32,10 +32,7 @@ import com.lyms.platform.operate.web.worker.BatchUpdateLymsPatient; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.dao.master.MasterOrganizationMapper; import com.lyms.platform.permission.model.*; -import com.lyms.platform.permission.service.CouponService; -import com.lyms.platform.permission.service.FactorProjectService; -import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; @@ -1233,7 +1230,7 @@ public class BookbuildingFacade { public void run() { for (int i = 0, j = patientList.size(); i < j; i++) { Patients patients = patientList.get(i); - String week = getBuildingWeek(patients); + String week = getBuildingWeek(patients,Integer.valueOf(hospitalId)); sendbuildingMsg(patients, SmsServiceEnums.CJYYTX.getId(), "【产检提醒】", "亲爱的孕妈妈，您当前孕周为" + week + ",请点击此处查看就诊流程。", week); if (CollectionUtils.isNotEmpty(patients.getRiskFactorId()) && !patients.getRiskFactorId().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { @@ -1259,7 +1256,9 @@ public class BookbuildingFacade { } logger.info("weekSync end"); } - + @Autowired + @Qualifier("projectWeekService") + private ProjectWeekService projectWeekService; /** * 查询孕期 @@ -1267,7 +1266,7 @@ public class BookbuildingFacade { * @param patients * @return */ - private String getBuildingWeek(Patients patients) { + private String getBuildingWeek(Patients patients,Integer hospitalId) { String dueWeek = ""; try { // 徐倩说改的 @@ -1280,7 +1279,7 @@ public class BookbuildingFacade { dueWeek = ""; } else { String week= days / 7+""; - dueWeek = ProjectWeekEnums.getWeekName(week); + dueWeek = projectWeekService.selectByWeek(hospitalId,week);; /*int day = (days % 7); dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");*/ } -- 1.8.3.1