pom.xml
@@ -199,6 +199,41 @@ <version>${ruoyi.version}</version> </dependency> <!-- åºå ¥é¢é访模åï¼åªä¾èµ ruoyi-commonï¼ä¸ä¾èµ smartorï¼æ æ 循ç¯ä¾èµï¼ --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-inhospvisit</artifactId> <version>${ruoyi.version}</version> </dependency> <!-- 宣æ模åï¼åªä¾èµ ruoyi-commonï¼ä¸ä¾èµ smartor/inhospvisitï¼æ æ 循ç¯ä¾èµï¼ --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-publicity</artifactId> <version>${ruoyi.version}</version> </dependency> <!-- é¨æ¥è¯é访模åï¼åªä¾èµ ruoyi-commonï¼ä¸ä¾èµ smartorï¼æ æ 循ç¯ä¾èµï¼ --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-outpatientvisit</artifactId> <version>${ruoyi.version}</version> </dependency> <!-- å ¶ä»é访模åï¼ææ¯é访ï¼åªä¾èµ ruoyi-commonï¼ä¸ä¾èµ smartorï¼ --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-othervisit</artifactId> <version>${ruoyi.version}</version> </dependency> <!-- 模æ¿æ¨¡åï¼å®£æ模æ¿/è¯é³æ¨¡æ¿/é®å·æ¨¡æ¿/æ¹æ¡åºï¼åªä¾èµ ruoyi-commonï¼ä¸ä¾èµ smartorï¼ --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-template</artifactId> <version>${ruoyi.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -211,6 +246,13 @@ <module>ruoyi-common</module> <module>ruoyi-message</module> <module>ruoyi-satisfaction</module> <!-- åºå ¥é¢é访 / 宣æ / é¨æ¥è¯é访 / å ¶ä»é访 / 模æ¿ï¼é½åªä¾èµ ruoyi-commonï¼å¿ é¡»æå¨ä¾èµå®ä»¬ç smartor ä¹å --> <module>ruoyi-inhospvisit</module> <module>ruoyi-publicity</module> <module>ruoyi-outpatientvisit</module> <module>ruoyi-othervisit</module> <module>ruoyi-template</module> <!-- smartor ä¾èµ ruoyi-satisfaction / ruoyi-inhospvisit / ruoyi-publicity / ruoyi-outpatientvisit / ruoyi-othervisit / ruoyi-templateï¼å¿ é¡»ææå --> <module>smartor</module> </modules> <packaging>pom</packaging> ruoyi-admin/pom.xml
@@ -97,6 +97,21 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi-satisfaction</artifactId> </dependency> <!-- åºå ¥é¢é访模å / 宣æ模åã â ï¸ è¿éãå¿ é¡»æ¾å¼å£°æãï¼ä¸è½åªé smartor ä¼ éï¼ æ»¡æ度é£æ¬¡å°±æ¯"æ ¹ pom 注åäºæ¨¡åï¼ä½æ²¡æä»»ä½æ¨¡åç´æ¥ä¾èµå®"ï¼ å¯¼è´æ¨¡åæ ¹æ¬æ²¡è¢«æè¿ smartor-suifang.jarï¼æ°æ¬ç端ç¹å ¨é¨ä¸å¯è¾¾ã æ¬æ¨¡åè¦æ¾ Controller ä¸ Mapper XMLï¼æ以ç´æ¥ä¾èµã --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-inhospvisit</artifactId> </dependency> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-publicity</artifactId> </dependency> <!-- https://mvnrepository.com/artifact/net.glxn.qrgen/javase --> <dependency> <groupId>net.glxn.qrgen</groupId> ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -39,6 +39,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import com.ruoyi.template.domain.HeLibrary; import com.ruoyi.template.api.TemplateFacade; @Slf4j @Component//çå¬æ¤éå public class RedisMqReceiver extends KeyExpirationEventMessageListener { @@ -58,12 +60,26 @@ @Autowired private IServiceOutPathService iServiceOutPathService; /** * 模æ¿æ°æ®ä¸å¾ç» ruoyi-template çé¨é¢åç¨ï¼è·¨æ¨¡åæ°æ®è®¿é®ååï¼ã */ @Autowired private TemplateFacade templateFacade; /** * 宣æ模åç<b>常驻é¨é¢</b>ï¼ç¨äºå¤ {@code sys_config: publicity.enabled}ã * <p> * â ï¸ 2025 ä¿®å¤ï¼æ¬ç±»åæ¬<b>å®å ¨æ²¡è¯»å®£æå¼å ³</b> ââ * {@code tsakHandle} çå ¬ä¼å· {@code type == 3} åæ¯ï¼L518ã//宣æãï¼ * ç §å¸¸æ¼å®£æé¾æ¥å¹¶åéï¼æä»¥å ³æ {@code publicity.enabled} ä¹æ¦ä¸ä½è¿æ¡è·¯ã */ @Autowired private com.ruoyi.publicity.api.PublicityFacade publicityFacade; @Autowired private ServiceSubtaskMapper ivrTaskcallMapper; @Autowired private HeLibraryMapper heLibraryMapper; @Autowired private ServiceTaskMapper ivrTaskMapper; @@ -208,6 +224,22 @@ continue; } String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(sendPreachform)); // â ï¸ 2025 ä¿®å¤ï¼å®£æå¼å ³å¤±æï¼ï¼type == 3 æ¯**宣æ/éç¥**ï¼çº¯åéãæ ä½çï¼ // è§ setFailPreachForm éã宣ææéç¥â¦ç´æ¥æ¹æ 9ãçå¤å®ï¼ï¼æ´æ¡æ´¾åçææéé // ï¼çµè¯/çä¿¡/å ¬ä¼å·/人工ï¼åçé½æ¯å®£æå 容ãæä»¥å ³æ publicity.enabled æ¶ // åºå½**ä¸ä¸ªééé½ä¸å**ï¼èä¸æ¯åªæ¦å ¶ä¸ä¸æ®µã // // â ï¸ å»æ**ä¸æ¨è¿ subtask ç¶æãä¹ä¸è®°å¤±è´¥**ï¼å ³éæ¯"ææ¶ä¸å"ï¼ // ä¸æ¯"è¿ä¸ªæ£è ä¸éè¦å®£æ"ãè¥æ æ失败/ä¸éè¦ï¼å¼å ³æ¢å¤åè¿æ¡å®£æ就永è¿ä¸¢äºã // ä¿æ sendstate=2 ä¸å¨ï¼å¼å ³æå¼åä¸ä¸æ¬¡æ´¾åä¼ç §å¸¸ååºã // ï¼æ¬æ¹æ³çè°ç¨æ¹ onMessage å¤çå®å³å Redis æ¶æ¯ãä¸éæï¼æ以ä¸ä¼é æéæé£æ´ãï¼ if (type != null && type == 3 && !publicityFacade.isEnabled()) { log.warn("ã宣æã模åæªå¯ç¨ï¼åæ°é ç½® publicity.enabled=falseï¼ï¼è·³è¿å®£æåéãsubtaskId={}, patid={}", serviceSubtask.getId(), serviceSubtask.getPatid()); continue; } if (descByCode.equals("çµè¯")) { try { ServiceTask ivrTask = ivrTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid()); @@ -379,7 +411,10 @@ String url = ""; String format = String.format("%03X", serviceOutPath.getId()); //éè¦éè¿æ¨¡æ¿IDå»å¤æè¦åçå 容æ¯å®£æè¿æ¯éç¥ HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); // â ï¸ ä¸ RyTask åå£å¾ï¼**å»æä¸**为 TemplateModuleDisabledException é级 ââ // 模æ¿æ¨¡åå ³éæ¶å®£æå 容åä¸å°ãçä¿¡ç¡®å®åä¸åºå»ï¼å¤å± try-catch å¦å®è®°å¤±è´¥ // 并走æ¢æçééå级æºå¶ã硬记æåçäºç¨åè®°å½æ©ç"没ååºå»"ã HeLibrary heLibrary = templateFacade.findHeLibraryById(serviceSubtask.getLibtemplateid()); if (heLibrary.getHetype().equals("1")) { sendMagParam.setPhone(serviceSubtask.getPhone()); url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/xj?p=" + format : ip + "/xj?p=" + format; @@ -523,7 +558,7 @@ String format = String.format("%03X", serviceOutPath.getId()); //éè¦éè¿æ¨¡æ¿IDå»å¤æè¦åçå 容æ¯å®£æè¿æ¯éç¥ // HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); // HeLibrary heLibrary = templateFacade.findHeLibraryById(serviceSubtask.getLibtemplateid()); // if (heLibrary.getHetype().equals("1")) { // sendMagParam.setPhone(serviceSubtask.getPhone()); // sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format); ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java
@@ -6,8 +6,6 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.StringUtils; import com.smartor.domain.*; import com.smartor.mapper.IvrLibaExtemplatescriptMapper; import com.smartor.service.IIvrLibaTemplateService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -26,28 +24,31 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.ruoyi.template.domain.IvrLibaExtemplatescript; import com.ruoyi.template.domain.IvrLibaTemplateScriptVO; import com.ruoyi.template.domain.IvrLibaTemplateVO; import com.ruoyi.template.api.TemplateFacade; @Slf4j @Component public class ChatWebSocketHandler extends AbstractWebSocketHandler { private static RedisCache redisCache; private static IIvrLibaTemplateService ivrLibaTemplateService; /** * 模æ¿æ°æ®ä¸å¾ç» ruoyi-template çé¨é¢åç¨ï¼è·¨æ¨¡åæ°æ®è®¿é®ååï¼ã * <p> * 沿ç¨æ¬ç±»åæçãstatic å段 + @Autowired setterãè£ é é£æ ¼ï¼ * ä¸æ¹é ææé æ³¨å ¥ ââ é¿å å½±åè¿æ¡å·²æçè£ é è·¯å¾ã */ private static TemplateFacade templateFacade; private static IvrLibaExtemplatescriptMapper ivrLibaExtemplatescriptMapper; @Autowired public void setTemplateFacade(TemplateFacade templateFacade) { ChatWebSocketHandler.templateFacade = templateFacade; } // ç¨äºåå¨ç¨æ·IDåWebSocketSessionçæ å°å ³ç³» private static Map<String, WebSocketSession> sessions = new ConcurrentHashMap<>(); @Autowired public void setIEMapper(IvrLibaExtemplatescriptMapper ivrLibaExtemplatescriptMapper) { ChatWebSocketHandler.ivrLibaExtemplatescriptMapper = ivrLibaExtemplatescriptMapper; } @Autowired public void setTodayReaderService(IIvrLibaTemplateService ivrLibaTemplateService) { ChatWebSocketHandler.ivrLibaTemplateService = ivrLibaTemplateService; } @Autowired public void setRedisCache(RedisCache redisCache) { @@ -118,7 +119,12 @@ //éè¿æ¨¡æ¿IDè·å模æ¿é®é¢ IvrLibaTemplateVO ivrLibaTemplateVO = new IvrLibaTemplateVO(); ivrLibaTemplateVO.setId(socketMessage.getTemplateId()); IvrLibaTemplateVO ivrLibaTemplateVO1 = ivrLibaTemplateService.selectInfoByCondition(ivrLibaTemplateVO); // â ï¸ è¿é**å»æä¸**为 TemplateModuleDisabledException éçº§ï¼ // è¯é³é®å·æ¬èº«å°±æ¯æ¨¡æ¿é©±å¨ç ââ 模æ¿æ¨¡åå ³éï¼sys_config: template.enabled=falseï¼æ¶ // è¿æ¬¡å¯¹è¯æ²¡æä»»ä½é®é¢å¯é®ï¼ç»§ç»èµ°ä¸å»åªä¼æ¿å° null ç¶åå¨ä¸ä¸è¡ NPEã // æåºæç¡®å¼å¸¸ï¼æ示"模æ¿åè½æªå¯ç¨â¦"ï¼è¿å¥½äºä¸ä¸ªçä¸æç空æéï¼ // ä¸å¼å¸¸ä¼ç± handleTextMessage æåºãç± WebSocket 容å¨æ¶å£ã IvrLibaTemplateVO ivrLibaTemplateVO1 = templateFacade.findIvrLibaTemplateInfoByCondition(ivrLibaTemplateVO); redisCache.setCacheObject(userId + "ivrLibaTemplateVO1", ivrLibaTemplateVO1, 120, TimeUnit.MINUTES); //å°æ¥åºæ¥çé®é¢,æ¾å°å ¨å±åéä¸å» List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = ivrLibaTemplateVO1.getIvrLibaTemplateScriptVOList(); @@ -167,7 +173,6 @@ } //è·å模æ¿ä¿¡æ¯ IvrLibaTemplateVO ivrLibaTemplateVO1 = redisCache.getCacheObject(userId + "ivrLibaTemplateVO1"); if (StringUtils.isEmpty(questionMessage.getContent())) { //è°ç¨ivrTaskTemplateScriptVOä¸çslienceText(éé»è¯æ¯) @@ -229,7 +234,9 @@ for (String str : list) { list1.add(Long.valueOf(str)); } List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1); // â ï¸ ä¸ä¸é¢é£å¤ä¸åï¼æ¬æ¹æ³è¿åçæ¯**å表**ï¼ç©ºå表天ç¶å¯å®¹é // ï¼ä¸é¢ç for 循ç¯ä¸æ¬¡é½ä¸è¿ï¼ï¼æ以模æ¿æ¨¡åå ³éæ¶ä¸éè¦é¢å¤é级åæ¯ã List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = templateFacade.findIvrLibaExtemplatescriptsByIds(list1); IvrLibaExtemplatescript les = null; for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) { Matcher matcher = null; @@ -272,7 +279,6 @@ } } } //éè¿valueTypeå¤ææ¯ä»ä¹é¢åï¼å¼ç±»åï¼1 é项 2 ææ¬ 3 æ°å¼ï¼ï¼ if (ivrLibaTemplateScriptVO.getValueType() == 2 || ivrLibaTemplateScriptVO.getValueType() == 3) { @@ -420,7 +426,7 @@ // for (String str : list) { // list1.add(Long.valueOf(str)); // } // List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1); // List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = templateFacade.findIvrLibaExtemplatescriptsByIds(list1); // for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) { // Matcher matcher = null; // if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex())) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/read/PatientInfoImportController.java
@@ -1,7 +1,6 @@ package com.ruoyi.web.controller.read; import com.ruoyi.common.core.controller.BaseController; import com.smartor.service.IBaseTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,8 +24,6 @@ @RestController @RequestMapping("/patient/read") public class PatientInfoImportController extends BaseController { @Autowired private IBaseTagService baseTagService; /** * æ£è åºæ¬ä¿¡æ¯ ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeCategoryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLocallibraryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateCategoryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplateController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaExtemplatescriptController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateAssortController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateScriptController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTagController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetoptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateScriptController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateTargetoptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallrecordController.java
@@ -1,4 +1,4 @@ package com.smartor.controller; package com.ruoyi.web.controller.smartor; import java.util.List; import javax.servlet.http.HttpServletResponse; ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTasksmsController.java
@@ -1,4 +1,4 @@ package com.smartor.controller; package com.ruoyi.web.controller.smartor; import java.util.List; import javax.servlet.http.HttpServletResponse; ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -1,34 +1,19 @@ package com.ruoyi.web.controller.smartor; import com.github.pagehelper.ISelect; import com.github.pagehelper.PageInfo; import com.ruoyi.common.annotation.AddOrgId; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysConfigService; import com.smartor.domain.DTO.PatMedInhospDTO; import com.smartor.domain.PatMedInhosp; import com.smartor.domain.PatMedInhospVO; import com.smartor.domain.PatMedReq; import com.smartor.domain.PatServiceCount; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.ruoyi.common.core.service.dto.PatMedReq; import com.smartor.service.IPatMedInhospService; import com.smartor.service.IPatMedOuthospService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; /** * æ£è ä½é¢è®°å½Controller @@ -49,167 +34,29 @@ @Autowired private IPatMedInhospService iPatMedInhospService; /** * åºå ¥é¢é访模åç<b>常驻é¨é¢</b>ï¼ç¬¬ 10 æ¥åæ¢ï¼ã * <p> * â ï¸ æ³¨å ¥é¨é¢èä¸æ¯å é¨å®ç°ï¼é¨é¢æ°¸è¿åå¨ï¼æ以å³ä½¿æ¨¡å被å¼å ³å ³æ * æ没被æè¿åºç¨ï¼æ¬ Controller ä¹<b>ä¸ä¼å¯å¨å¤±è´¥</b>ï¼åªæ¯è°ç¨é级并æ WARNã */ @Autowired private com.ruoyi.inhospvisit.api.InhospVisitFacade inhospVisitFacade; @Autowired private ISysConfigService configService; @Value("${server.port}") private String port; @Value("${spring.profiles.active}") private String active; /** * æ¥è¯¢æ£è ä½é¢è®°å½å表 */ @ApiOperation("æ¥è¯¢æ£è ä½é¢è®°å½å表") //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')") @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/selectPatMedInhospList") public TableDataInfo selectPatMedInhosplist(@RequestBody PatMedInhosp patMedInhosp) { PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize()); SysUser user = getLoginUser().getUser(); patMedInhosp.setOrgid(user.getOrgid()); List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp); // startPage ä¹å PageHelper å·²ç»èªå¨æ§è¡è¿ä¸æ¬¡ count æ¥è¯¢ï¼ç´æ¥å¤ç¨ Page éç totalï¼ // é¿å ç¨ PageUtils.count æ带 JOIN çç»è®¡è¯å¥åè·ä¸é long count = new PageInfo<>(list).getTotal(); return getDataTable2(count, list); } /** * æ¥è¯¢æ£è ä½é¢è®°å½éè¿å ¥é¢ç³è¯·åä¿¡æ¯ */ @ApiOperation("æ¥è¯¢æ£è ä½é¢è®°å½éè¿å ¥é¢ç³è¯·åä¿¡æ¯") //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')") @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/selectPatMedInhospByApplication") public TableDataInfo selectPatMedInhospByApplication(@RequestBody PatMedInhosp patMedInhosp) { PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize()); SysUser user = getLoginUser().getUser(); patMedInhosp.setOrgid(user.getOrgid()); List<PatMedInhospDTO> list = patMedInhospService.selectPatMedInhospByApplication(patMedInhosp); long count = PageUtils.count(new ISelect() { @Override public void doSelect() { patMedInhospService.selectPatMedInhospByApplication(patMedInhosp); } }); return getDataTable2(count, list); } /** * åºé¢ãé¨è¯äººæ°åé访éç»è®¡ï¼å¨ï¼æï¼å¹´ï¼ */ @ApiOperation("åºé¢ãé¨è¯äººæ°åé访éç»è®¡ï¼å¨ï¼æï¼å¹´ï¼") //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')") @PostMapping("/queryPersonCount") public TableDataInfo queryPersonCount(@RequestBody PatServiceCount patServiceCount) { return null; } /** * æ¥è¯¢å½åç»é人èªå·±ï¼ç åºãé¨é¨ï¼çæ£è ä½é¢è®°å½å表 */ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @ApiOperation("æ¥è¯¢å½åç»é人èªå·±ï¼ç åºãé¨é¨ï¼çæ£è ä½é¢è®°å½å表") @PostMapping("/selectPatMedInhospListByCondition") public TableDataInfo selectPatMedInhospListByCondition(@RequestBody PatMedInhospVO patMedInhospVO) { PageUtils.startPageByPost(patMedInhospVO.getPageNum(), patMedInhospVO.getPageSize()); List<PatMedInhosp> list = null; if (!CollectionUtils.isEmpty(patMedInhospVO.getLeavehospitaldistrictcodes())) { list = patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO); } else if (!CollectionUtils.isEmpty(patMedInhospVO.getLeaveldeptcodes())) { list = patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO); } long count = PageUtils.count(new ISelect() { @Override public void doSelect() { patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO); } }); return getDataTable2(count, list); } @PostMapping("/getDeptCodeByPatId") @ApiOperation("æ¥è¯¢ä½ãåºé¢é¨é¨ç¼ç éè¿patId") public AjaxResult getDeptCodeByPatId(@RequestBody PatMedInhosp patMedInhosp) { return success(patMedInhospService.getDeptCodeByPatId(patMedInhosp)); } /** * æ¥è¯¢åºãå ¥é¢çç 人次å人æ°ï¼äººæ°å为é¦æ¬¡æå¡ãå次æå¡ãä¸ç æå¡ï¼ */ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/selectPatMedInhospListCount") @ApiOperation("æ¥è¯¢åºãå ¥é¢çç 人次å人æ°") public AjaxResult selectPatMedInhospListCount(@RequestBody PatMedReq patMedReq) { SysUser user = getLoginUser().getUser(); patMedReq.setOrgid(user.getOrgid()); return success(patMedInhospService.selectPatMedInhospListCount(patMedReq)); } /** * 导åºæ£è ä½é¢è®°å½å表 */ @ApiOperation("导åºæ£è ä½é¢è®°å½å表") //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:export')") @Log(title = "æ£è ä½é¢è®°å½", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, PatMedInhosp patMedInhosp) { List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp); ExcelUtil<PatMedInhosp> util = new ExcelUtil<PatMedInhosp>(PatMedInhosp.class); util.exportExcel(response, list, "æ£è ä½é¢è®°å½æ°æ®"); } /** * è·åæ£è ä½é¢è®°å½è¯¦ç»ä¿¡æ¯ */ @ApiOperation("è·åæ£è ä½é¢è®°å½è¯¦ç»ä¿¡æ¯") //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:query')") @GetMapping(value = "/getInfo/{inhospid}") public AjaxResult getInfo(@PathVariable("inhospid") Long inhospid) { return success(patMedInhospService.selectPatMedInhospByInhospid(inhospid)); } /** * æ°å¢æ£è ä½é¢è®°å½ */ @ApiOperation("æ°å¢æ£è ä½é¢è®°å½") //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')") @Log(title = "æ£è ä½é¢è®°å½", businessType = BusinessType.INSERT) @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/add") public AjaxResult add(@RequestBody PatMedInhosp patMedInhosp) { SysUser user = getLoginUser().getUser(); patMedInhosp.setOrgid(user.getOrgid()); return toAjax(patMedInhospService.insertPatMedInhosp(patMedInhosp)); } /** * ä¿®æ¹æ£è ä½é¢è®°å½ */ @ApiOperation("ä¿®æ¹æ£è ä½é¢è®°å½") //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')") @Log(title = "æ£è ä½é¢è®°å½", businessType = BusinessType.UPDATE) @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/edit") public AjaxResult edit(@RequestBody PatMedInhosp patMedInhosp) { return toAjax(patMedInhospService.updatePatMedInhosp(patMedInhosp)); } /** * å é¤æ£è ä½é¢è®°å½ */ @ApiOperation("å é¤æ£è ä½é¢è®°å½") //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:remove')") @Log(title = "æ£è ä½é¢è®°å½", businessType = BusinessType.DELETE) @GetMapping("/remove/{inhospids}") public AjaxResult remove(@PathVariable Long[] inhospids) { return toAjax(patMedInhospService.deletePatMedInhospByInhospids(inhospids)); } /** * åç§å®¤æå¡äººæ¬¡ * @@ -222,7 +69,6 @@ return getDataTable(patMedInhospService.getDeptRanking(patMedReq)); } /** * å»æ¤ä¸æ£è å ³èå ³ç³» * @@ -232,57 +78,5 @@ @PostMapping("/getDocAndPat") public TableDataInfo getDocAndPat(@RequestBody PatMedInhosp patMedInhosp) { return getDataTable(patMedInhospService.getDocAndPat(patMedInhosp)); } // /** // * å»æ¤ä¸æ£è å ³èå ³ç³» // * // * @return // */ // @ApiOperation("å»æ¤ä¸æ£è å ³èå ³ç³»") // @GetMapping("/test") // public void test() { // patMedInhospService.dealOutHospInfo(); // // //é¨è¯è¡¨ // if (visitHosp != 1) { // iPatMedOuthospService.dealOutpatientInfo(); // } // } /** * å¤çæ£è ä¿¡æ¯ï¼è¿å ¥åä»»å¡è¡¨ */ @ApiOperation("dealOutHospInfo") @PostMapping("/dealOutHospInfo") public void dealOutHospInfo() { String config = configService.selectConfigByKey("visit.early.day"); //åºé¢è¡¨ iPatMedInhospService.dealOutHospInfo(config); //é¨è¯è¡¨(æ°åçææ¶ä¸åé¨è¯é访) if (!active.equals("xh")) { iPatMedOuthospService.dealOutpatientInfo(); } } /** * å¤çæ£è ä¿¡æ¯ï¼è¿å ¥åä»»å¡è¡¨ */ @ApiOperation("dealOutHospInfoBySchedule") @PostMapping("/dealOutHospInfoBySchedule") public void dealOutHospInfoBySchedule() { String config = configService.selectConfigByKey("visit.early.day"); //åºé¢è¡¨ iPatMedInhospService.dealOutHospInfoBySchedule(config); } /** * å¤çæ£è ä¿¡æ¯ï¼è¿å ¥åä»»å¡è¡¨ */ @ApiOperation("addOperationSubTask") @PostMapping("/addOperationSubTask") public void addOperationSubTask() { String config = configService.selectConfigByKey("visit.early.day"); iPatMedInhospService.addOperationSubTask(config); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospProvisionalController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/QRCodeController.java
@@ -11,8 +11,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.framework.config.ServerConfig; import com.smartor.domain.Question; import com.smartor.domain.SvyLibTemplate; import freemarker.template.Configuration; import com.ruoyi.template.domain.SvyLibTemplate;import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; import io.swagger.annotations.Api; @@ -73,7 +72,12 @@ public String generateStaticHtml(@PathVariable("reqid") String reqid, @PathVariable("userid") String userid) throws IOException, TemplateException { // å建Freemarkeré ç½® Configuration configuration = new Configuration(Configuration.VERSION_2_3_31); configuration.setClassForTemplateLoading(SvyLibTemplateController.class, "/template"); // â ï¸ ååæ³æ¯ `setClassForTemplateLoading(SvyLibTemplateController.class, "/template")`ï¼ // é£æ¯æ¿å®å½**类路å¾éç¹**ï¼æ¨¡æ¿å¨ ruoyi-template ç resources/template ä¸ï¼ã // 该 Controller å·²é模æ¿æ¨¡ååæ¬è¿ ruoyi-templateï¼ç±»è·¯å¾æ ¹**没å** // ï¼åä¸ä¸ª jarï¼ï¼æ以çä»·å°æ¹ç¨å为 ruoyi-template éç SvyLibTemplate ä½éç¹ // ââ é¿å smartor 侧å»å¼ç¨æ¨¡åç controller å ã configuration.setClassForTemplateLoading(SvyLibTemplate.class, "/template"); configuration.setDefaultEncoding("UTF-8"); try { ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeLocallibraryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -49,6 +49,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.ruoyi.template.domain.VO.HeLibraryCountVO; import static com.ruoyi.common.utils.SecurityUtils.getLoginUser; /** @@ -208,6 +209,10 @@ LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); serviceSubtaskVO.setOrgid(user.getOrgid()); //ä¸ /patItem æ¥è¯¢ä¿æå®å ¨ä¸è´çæºæ+é¢åºèå´ï¼ //导åºåå åªè®¾ç½® orgidï¼ç¼ºå° campusidï¼SQL éå°±ä¸ä¼æ¼ and campusid = ?ï¼ //导è´å¯¼åºçæ°æ®å å«å ¶å®é¢åºçæ£è ï¼åºç°âæ¥è¯¢ä¸å¯¼åºæ°æ®ä¸ä¸è´â serviceSubtaskVO.setCampusid(user.getCampusid()); List<ServiceSubtaskRes> serviceSubtaskList = null; if (serviceSubtaskVO != null) { ServiceSubtaskEntity serviceSubtaskEntity = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskEntity.class); @@ -374,7 +379,9 @@ * é访åå²è®°å½å¯¼åº */ @Log(title = "é访åå²è®°å½å¯¼åº", businessType = BusinessType.EXPORT) @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") //第 0 个åæ°æ¯ HttpServletResponseï¼æ³¨è§£åå°å®çäºæ²¡çæï¼orgid/campusid é½æ²¡æ³¨å ¥ï¼ï¼ //æ以è¿éè¦ç¨ paramIndex = 1 æå ServiceSubtaskï¼ä¸æ¥è¯¢æ¥å£ /getSubtaskByDiagname ä¿æåä¸èå´ @AddOrgId(field = "orgid", paramIndex = 1, campusField = "campusid") @PostMapping("/getSubtaskByDiagnameExport") public void getSubtaskByDiagnameExport(HttpServletResponse response, ServiceSubtask serviceSubtask) { LoginUser loginUser = getLoginUser(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishoptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyFinishtopicController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibExceptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibResultController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptCategoryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptOptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibScriptTagController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateCategoryController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.smartor.domain.ServiceSubtaskCountReq; import com.smartor.domain.SvyLibTemplateScript; import com.ruoyi.template.domain.SvyLibTemplateScript; import com.smartor.service.ISvyLibTemplateScriptService; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptWjxController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTagController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionWjxController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateWjxController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
@@ -30,6 +30,7 @@ import java.util.List; import java.util.stream.Collectors; import com.smartor.domain.SvyTask; /** * é®å·ä»»å¡ï¼ä»»å¡ï¼Controller * ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptoptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.smartor.domain.SvyTaskSingleVO; import com.smartor.domain.SvyTaskVO; /** * åä¸ä»»å¡ï¼é®å·ï¼Controller * ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateScriptController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateTargetoptionController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTopicController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
ÎļþÒÑɾ³ý ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
@@ -17,7 +17,7 @@ import com.smartor.domain.BaseSmsRequest; import com.smartor.domain.BaseSmsaccount; import com.smartor.domain.BatchBaseSmsRequest; import com.smartor.domain.TemplateSmsRequest; import com.ruoyi.template.domain.TemplateSmsRequest; import com.smartor.service.IBaseSmsaccountService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; ruoyi-admin/src/main/java/com/ruoyi/web/task/PhoneTask.java
@@ -5,7 +5,7 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.DtoConversionUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.smartor.config.PhoneUtils; import com.ruoyi.common.utils.PhoneUtils; import com.smartor.config.RobotPhoneUtils; import com.smartor.domain.*; import com.smartor.domain.robot.RobotData; @@ -16,6 +16,8 @@ import java.util.*; import java.util.concurrent.TimeUnit; import com.ruoyi.template.domain.IvrTaskTemplateScriptVO; import com.ruoyi.template.domain.IvrTaskTemplateVO; public class PhoneTask implements Runnable { private ServiceSubtask ivrTaskSingle; private List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVO; ruoyi-admin/src/main/resources/application-ywry.yml
@@ -6,9 +6,10 @@ druid: # 主åºæ°æ®æº master: url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://127.0.0.1:3306/smartor-suifang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=120000 username: root password: Smartor.2023 password: 123456 driverClassName: com.mysql.cj.jdbc.Driver # ä»åºæ°æ®æº slave: ruoyi-admin/src/main/resources/application.yml
@@ -75,7 +75,7 @@ # å½é åèµæºæä»¶è·¯å¾ basename: i18n/messages profiles: active: sltd active: druid # æ件ä¸ä¼ servlet: ruoyi-message/target/classes/com/ruoyi/message/MessageChannel.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/SendException.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/SendResult.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/AliyunSmsConfig.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MessageConfigValidator.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MessageProperties$MessagingInsert.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MessageProperties$ShiyiSms.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MessageProperties$ShiyiWechat.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MessageProperties$Sms.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MessageProperties$Wechat.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MessageProperties$Xinhua.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MessageProperties.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/MtSmsConfig.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/RootMessageProperties.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/config/XhsmsConfig.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/AbstractSmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/SmsSendRequest.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/SmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/SmsSenderFactory.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/aliyun/AliYunSmsApi.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/aliyun/AliYunSmsSender$1.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/aliyun/AliYunSmsSender$SendSmsRequestAdapter.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/aliyun/AliYunSmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/hzszlyy/ShiyiSmsApi.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/hzszlyy/ShiyiSmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/ls/LishuiMessageConfig.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/ls/LishuiMessageConfigProvider.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/ls/LishuiSmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/ls/LishuiStaticConfig.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/messaginginsert/MessagingInsertSmsApi.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/messaginginsert/MessagingInsertSmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/messaginginsert/ws/MessagingInsert.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/messaginginsert/ws/MessagingInsertLocator.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/messaginginsert/ws/MessagingInsertSoap12Stub.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/messaginginsert/ws/MessagingInsertSoap_BindingStub.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/messaginginsert/ws/MessagingInsertSoap_PortType.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/nhfy/MtSubmitSmResp.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/nhfy/MtSubmitSmUtil.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/nhfy/NhfySmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/shiyi/ShiyiHisSmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/shiyi/ShiyiSmsRequest.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/shiyi/ShiyiSmsResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/shiyi/ShiyiSmsUtil.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/SltdResponseParser.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/SltdSmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/Hello.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/HelloResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/I5GReply.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/I5GReplyResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/I5GReport.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/I5GReportResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/I5GSearchNumber.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/I5GSearchNumberResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/I5GSend.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/I5GSendResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/MessageSend.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/ObjectFactory.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSGetNumber.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSGetNumberResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSGetTemplateList.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSGetTemplateListResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSGetUserList.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSGetUserListResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSSaveContent.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSSaveContentResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSVerify.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSVerifyPrivate.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSVerifyPrivateResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SMSVerifyResponse.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SmsService.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/SmsServiceSoap.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/sltd/ws/package-info.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/sms/provider/xh/XinHuaSmsSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/WechatMpConfig.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/WechatMpConfigProvider.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/WechatSendRequest.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/WechatSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/WechatSenderFactory.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/provider/hzszlyy/ShiyiMpApi.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/provider/hzszlyy/ShiyiMpSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/provider/sdk/WxMpSdkSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/provider/xh/XinHuaMpApi.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/provider/xh/XinHuaMpSender.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/provider/xh/XinHuaWXReq.classBinary files differ
ruoyi-message/target/classes/com/ruoyi/message/wechat/support/WxMpUtils.classBinary files differ
ruoyi-message/target/classes/message-binding-check.yml
ÎļþÒÑɾ³ý ruoyi-message/target/classes/wsdl/MessagingInsert.asmx
ÎļþÒÑɾ³ý ruoyi-message/target/maven-archiver/pom.properties
ÎļþÒÑɾ³ý ruoyi-message/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
ÎļþÒÑɾ³ý ruoyi-message/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
ÎļþÒÑɾ³ý ruoyi-message/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
ÎļþÒÑɾ³ý ruoyi-message/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
ÎļþÒÑɾ³ý ruoyi-message/target/ruoyi-message-3.8.5.jarBinary files differ
ruoyi-message/target/test-classes/com/ruoyi/message/config/MessagePropertiesBindingCheck.classBinary files differ
ruoyi-message/target/test-classes/com/ruoyi/message/config/PerSiteBindingCheck.classBinary files differ
ruoyi-message/target/test-classes/message-binding-check.yml
ÎļþÒÑɾ³ý ruoyi-quartz/pom.xml
@@ -44,6 +44,38 @@ <version>3.8.5</version> </dependency> <!-- åºå ¥é¢é访模åï¼æ¬æ¨¡åç HIS ééï¼CollectHISServiceImpl / CollectHISMapperï¼ éè¦è¯»ååºå ¥é¢è®°å½ï¼è PatMedInhosp / PatMedInhospVO / PatMedInhospMapper å·²ç¬å æ¬å ¥è¯¥æ¨¡åï¼æ æ¤å¤éè¦ç¼è¯æä¾èµã --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-inhospvisit</artifactId> </dependency> <!-- é¨æ¥è¯é访模åï¼é¨è¯åè¡¨ç»´æ¤ + åå¨è¿ç¨é建ï¼å ruoyi-quartz.util.CreateDataTableï¼ å·²æ´ä½è¿å ¥è¯¥æ¨¡åï¼RyTask æ¹ä¸ºç»å ¶é¨é¢è°ç¨ï¼æ æ¤å¤éè¦ç¼è¯æä¾èµã --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-outpatientvisit</artifactId> </dependency> <!-- å ¶ä»é访模åï¼ææ¯é访ï¼ï¼`CollectHISMapper.xml` é声æäº `com.ruoyi.othervisit.domain.PatMedOperation` / `PatMedOperationItem` ä½ä¸º parameterType/resultType ââ MyBatis è¿è¡æ¶è¦ Class.forName å®ä»¬ã åå åªé smartor ä¼ é带è¿æ¥ï¼smartor ä¾èµ othervisitï¼ï¼ ä¸æ¦ smartor ä¸åä¾èµå®ï¼**XML ä¼å¨å¯å¨/é¦æ¬¡è°ç¨æ¶å¤±è´¥**ã æ æ¤å¤æ¾å¼å£°æï¼è®©"è½è§£æå°"æ为ç¼è¯æäºå®èä¸æ¯ä¼ éä¾èµçå·§åã --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-othervisit</artifactId> </dependency> <!-- æ¶æ¯åéï¼çä¿¡/å¾®ä¿¡å ¬ä¼å·ï¼æ¨¡å --> <dependency> <groupId>com.ruoyi</groupId> ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/CollectHISMapper.java
@@ -7,6 +7,10 @@ import com.ruoyi.common.core.domain.entity.SysUserRole; import com.ruoyi.common.enums.DataSourceType; import com.smartor.domain.*; import com.ruoyi.othervisit.domain.PatMedOperation; import com.ruoyi.othervisit.domain.PatMedOperationItem; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ICollectHISService.java
@@ -3,6 +3,8 @@ import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.smartor.domain.*; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import java.util.List;
@@ -1,5 +1,7 @@ package com.ruoyi.quartz.service.impl; import com.ruoyi.othervisit.api.OtherVisitFacade; import com.ruoyi.inhospvisit.api.InhospVisitFacade; import com.google.gson.Gson; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; @@ -29,11 +31,22 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import com.ruoyi.othervisit.domain.PatMedOperationItem; import com.ruoyi.outpatientvisit.mapper.PatMedOuthospMapper; import com.ruoyi.othervisit.domain.PatMedOperation; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; @Slf4j @Service public class CollectHISServiceImpl implements ICollectHISService { @Autowired private CollectHISMapper chMapper; /** * ææ¯æ°æ®ä¸å¾ç» ruoyi-othervisit çé¨é¢åç¨ï¼è·¨æ¨¡åæ°æ®è®¿é®ååï¼ã */ @Autowired private OtherVisitFacade otherVisitFacade; @Autowired private SysUser2Mapper sysUser2Mapper; @@ -57,7 +70,7 @@ private PatMedOuthospMapper patMedOuthospMapper; @Autowired private PatMedInhospMapper patMedInhospMapper; private InhospVisitFacade inhospVisitFacade; @Autowired private PatArchiveMapper patArchiveMapper; @@ -83,11 +96,7 @@ @Value("${spring.profiles.active}") private String active; @Autowired private PatMedOperationMapper patMedOperationMapper; @Autowired private PatMedOperationItemMapper patMedOperationItemMapper; @Override public List<PatArchive> selectPatArchiveList(PatArchive patArchive) { @@ -238,7 +247,7 @@ //åæ¥åºå ¥é¢ PatMedInhosp pmi = new PatMedInhosp(); pmi.setSerialnum(pm.getSerialnum()); List<PatMedInhosp> patMedInhospList1 = patMedInhospMapper.selectPatMedInhospListBySerialnum(pmi); List<PatMedInhosp> patMedInhospList1 = inhospVisitFacade.selectPatMedInhospListBySerialnum(pmi); if (patMedInhospList1.size() == 0) { pm.setCreateTime(new Date()); //å¸ä¸ é¢åºid对åºorgidï¼æºæid为é»è®¤ç1 @@ -246,7 +255,7 @@ pm.setCampusid(pm.getOrgid()); pm.setOrgid("1"); } count += patMedInhospMapper.insertPatMedInhosp(pm); count += inhospVisitFacade.insertPatMedInhosp(pm); } else { pm.setInhospid(patMedInhospList1.get(0).getInhospid()); pm.setUpdateTime(new Date()); @@ -255,7 +264,7 @@ pm.setCampusid(pm.getOrgid()); pm.setOrgid("1"); } count += patMedInhospMapper.updatePatMedInhosp(pm); count += inhospVisitFacade.updatePatMedInhosp(pm); } } catch (Exception ex) { log.info("åæ¥åºå ¥é¢:" + ex.getMessage()); @@ -366,15 +375,15 @@ } PatMedOperation oper = new PatMedOperation(); oper.setOpreqid(operation.getOpreqid()); List<PatMedOperation> patMedOperations1 = patMedOperationMapper.selectPatMedOperationList(oper); List<PatMedOperation> patMedOperations1 = otherVisitFacade.selectOperationList(oper); if (CollectionUtils.isNotEmpty(patMedOperations1)) { operation.setId(patMedOperations1.get(0).getId()); operation.setUpdateTime(new Date()); count += patMedOperationMapper.updatePatMedOperation(operation); count += otherVisitFacade.updateOperation(operation); syncOperItem(operation); } else { operation.setCreateTime(new Date()); count += patMedOperationMapper.insertPatMedOperation(operation); count += otherVisitFacade.insertOperation(operation); syncOperItem(operation); } } catch (Exception ex) { @@ -387,7 +396,7 @@ private Integer cancelOper(PatMedOperation oper){ PatMedOperation operationVo = new PatMedOperation(); operationVo.setOpreqid(oper.getOpreqid()); List<PatMedOperation> operations = patMedOperationMapper.selectPatMedOperationList(operationVo); List<PatMedOperation> operations = otherVisitFacade.selectOperationList(operationVo); PatMedOperation operation = new PatMedOperation(); if(CollectionUtils.isEmpty(operations)){ return 0; @@ -399,7 +408,7 @@ //è·åéè¦åºé¢ææ¯é访ï¼æªå¤ççæ°æ® pmoi.setOpid(operation.getId().toString()); List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemList(pmoi); = otherVisitFacade.selectOperationItemListByCondition(pmoi); List<Long> operationItemIds = patMedOperationItems.stream() .map(PatMedOperationItem::getId) .filter(Objects::nonNull) @@ -432,8 +441,8 @@ } } operation.setUpdateTime(new Date()); patMedOperationMapper.updatePatMedOperation(operation); patMedOperationItemMapper.deleteSoftPatMedOperationItemByOpId(operation.getOpid()); otherVisitFacade.updateOperation(operation); otherVisitFacade.deleteSoftOperationItemByOpId(operation.getOpid()); return 1; } @@ -448,7 +457,7 @@ operation.setOpid(operation.getId().toString()); } operation.setUpdateTime(new Date()); patMedOperationMapper.updatePatMedOperation(operation); otherVisitFacade.updateOperation(operation); Integer count = 0; if(StringUtils.isNotEmpty(operation.getOpid())){ @@ -465,7 +474,7 @@ PatMedOperationItem operItem = new PatMedOperationItem(); operItem.setOperationid(operation.getOpreqid()); List<PatMedOperationItem> patMedOperationItems1 = patMedOperationItemMapper.selectPatMedOperationItemList(operItem); List<PatMedOperationItem> patMedOperationItems1 = otherVisitFacade.selectOperationItemList(operItem); Map<String, List<PatMedOperationItem>> maps = ArrayListUtils.splitListsById(patMedOperationItems, patMedOperationItems1, PatMedOperationItem::getOperationid); @@ -486,12 +495,12 @@ operationItem.setOperationid(operation.getOpreqid()); operationItem.setOpercheckFlag("0"); operationItem.setCreateTime(new Date()); count += patMedOperationItemMapper.insertPatMedOperationItem(operationItem); count += otherVisitFacade.insertOperationItem(operationItem); } for (PatMedOperationItem operationItem : delItems) { operationItem.setUpdateTime(new Date()); count += patMedOperationItemMapper.deletePatMedOperationItemByOperationid(operationItem.getOperationid()); count += otherVisitFacade.deleteOperationItemByOperationid(operationItem.getOperationid()); } for (PatMedOperationItem operationItem : editItems) { @@ -500,7 +509,7 @@ operationItem.setOpid(operation.getId().toString()); operationItem.setOperationid(operation.getOpreqid()); operationItem.setUpdateTime(new Date()); count += patMedOperationItemMapper.updatePatMedOperationItemByOperationid(operationItem); count += otherVisitFacade.updateOperationItemByOperationid(operationItem); } log.info("åæ¥ææ¯id={}详æ ä¿¡æ¯æ°é, æ°å¢{}æ¡ï¼å é¤{}æ¡ï¼ä¿®æ¹{}æ¡", operation.getId(), addItems.size(), delItems.size(), editItems.size()); } catch (Exception ex) { @@ -508,8 +517,8 @@ } // try { // patMedOperationItemMapper.deleteHardPatMedOperationItemByOpId(operation.getOpid()); // count += patMedOperationItemMapper.insertPatMedOperationItems(patMedOperationItems); // otherVisitFacade.deleteHardOperationItemByOpId(operation.getOpid()); // count += otherVisitFacade.insertOperationItems(patMedOperationItems); // }catch (Exception ex) { // log.info("åæ¥ææ¯è¯¦æ ä¿¡æ¯:" + ex.getMessage()); // } @@ -593,20 +602,20 @@ //å ¥é¢ pm.setInhospstate("0"); pm.setCreateTime(new Date()); patMedInhospMapper.insertPatMedInhosp(pm); inhospVisitFacade.insertPatMedInhosp(pm); } else if (!Objects.isNull(patMedInhosp.getStartOutHospTime()) && !Objects.isNull(patMedInhosp.getEndOutHospTime())) { //åºé¢ pm.setInhospstate("1"); pm.setUpdateTime(new Date()); PatMedInhosp pmi = new PatMedInhosp(); pmi.setSerialnum(pm.getSerialnum()); List<PatMedInhosp> patMedInhospList1 = patMedInhospMapper.selectPatMedInhospList(pmi); List<PatMedInhosp> patMedInhospList1 = inhospVisitFacade.selectPatMedInhospList(pmi); if (CollectionUtils.isEmpty(patMedInhospList1)) { pm.setCreateTime(new Date()); patMedInhospMapper.insertPatMedInhosp(pm); inhospVisitFacade.insertPatMedInhosp(pm); } else { pm.setInhospid(patMedInhospList1.get(0).getInhospid()); patMedInhospMapper.updatePatMedInhosp(pm); inhospVisitFacade.updatePatMedInhosp(pm); } } ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -25,7 +25,6 @@ import com.ruoyi.quartz.enums.MzGatherSlotEnum; import com.ruoyi.quartz.enums.MzGatherStatusEnum; import com.ruoyi.quartz.service.ICollectHISService; import com.ruoyi.quartz.util.CreateDataTable; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; import com.ruoyi.system.service.ISysConfigService; @@ -60,6 +59,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.ruoyi.template.domain.HeLibrary; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.ruoyi.template.api.TemplateFacade; /** * å®æ¶ä»»å¡è°åº¦æµè¯ * @@ -71,6 +73,12 @@ @Autowired private IServiceThirdDataService iServiceThirdDataService; /** * 模æ¿æ°æ®ä¸å¾ç» ruoyi-template çé¨é¢åç¨ï¼è·¨æ¨¡åæ°æ®è®¿é®ååï¼ã */ @Autowired private TemplateFacade templateFacade; @Autowired private IServiceOutPathService iServiceOutPathService; @@ -80,11 +88,15 @@ @Autowired private IPatMedInhospService iPatMedInhospService; /** * ææ¯é访模åç<b>常驻é¨é¢</b>ï¼åæ³¨å ¥ {@code IPatMedOperationService}ï¼ã * <p> * ææ¯é访ç¼æå·²æ´ä½è¿å ¥ {@code ruoyi-othervisit}ï¼æ¬ç±»åªåè°ç¨ã * â ï¸ æ³¨å ¥é¨é¢èä¸æ¯æ¨¡åå é¨å®ç°ï¼é¨é¢æ°¸è¿åå¨ï¼æ¨¡åæªæè¿åºç¨æ * {@code othervisit.enabled=false} æ¶åªæ¯é级并æ WARNï¼ä¸ä¼å¯å¨å¤±è´¥ã */ @Autowired private IPatMedOuthospService iPatMedOuthospService; @Autowired private IPatMedOperationService iPatMedOperationService; private com.ruoyi.othervisit.api.OtherVisitFacade otherVisitFacade; @Autowired private IServiceSubtaskService iServiceSubtaskService; @@ -102,9 +114,6 @@ private SysUserImportMapper sysUserImportMapper; @Autowired private HeLibraryMapper heLibraryMapper; @Autowired private ICollectHISService ichService; @Autowired @@ -115,7 +124,6 @@ @Autowired private ISysUserService userService; @Value("${localIP}") private String localIP; @@ -154,12 +162,6 @@ IPatMedOuthospService patMedOuthospService; @Autowired ISvyTaskTemplateService svyTaskTemplateService; @Autowired IIvrTaskTemplateService iIvrTaskTemplateService; @Autowired IXHGatherPatArchiveService ixhGatherPatArchiveService; @Autowired @@ -168,9 +170,48 @@ @Autowired ICollectHISService icollectHis; /** * é¨è¯å表维æ¤å·²æ´ä½è¿å ¥ {@code ruoyi-outpatientvisit}ï¼è¿éåªææå®ç常驻é¨é¢ã * <p> * â ï¸ æ³¨å ¥é¨é¢èä¸æ¯å é¨å®ç°ï¼é¨é¢<b>æ°¸è¿åå¨</b>ï¼å³ä½¿æ¨¡å没被æè¿åºç¨æ¬ç±»ä¹ä¸ä¼å¯å¨å¤±è´¥ã */ @Autowired CreateDataTable createDataTable; private com.ruoyi.outpatientvisit.api.OuthospVisitFacade outhospVisitFacade; /** * åºå ¥é¢é访模åç<b>常驻é¨é¢</b>ã * <p> * â ï¸ 2025 ä¿®å¤ï¼æ¬ç±»ç <b>3 个éè®¿å ¥å£åå ä¸å¤å¼å ³</b> ââ * å®ä»¬è°ç¨ {@code IPatMedInhospService}ï¼smartor éçéçå®ç°ï¼è§ * {@code PatMedInhospServiceImpl}ï¼ï¼èé£ä¸ªå®ç°ç¨é¨é¢<b>åªæ¯ä¸ºäºåæ°æ®</b> * ï¼{@code selectPatMedInhospList} / {@code updatePatMedInhosp}ï¼ï¼ * <b>ä»ä¸è°ç¨é¨é¢çç¼ææ¹æ³</b>ãäºæ¯ {@code inhospvisit.enabled} / * {@code publicity.enabled} / {@code othervisit.enabled} 对å®æ¶ä»»å¡<b>å®å ¨å¤±æ</b>ï¼ * é¨é¢çç¼æå®å«ï¼{@code InhospVisitFacade#dealOutHospInfo} çï¼è½ç¶æå®ç°ã * ææµè¯ï¼å´åªæ HTTP æå¨è§¦åé£ä¸æ¡è·¯èµ°å¾å°ã * <p> * ç°å¨æ¹ä¸ºä¸ææ¯é访ï¼ææ¯é访æ©å·²èµ° {@code otherVisitFacade}ï¼è§ {@link #dealOperationInfo()}ï¼ * å®å ¨åå½¢ï¼å®æ¶ä»»å¡èµ°é¨é¢ï¼å¼å ³å¨é¨é¢éç»ä¸å¤ã模åå®ç°å é¨ä¼åè° * {@code PublicityApi} / {@code OtherVisitApi}ï¼é£ä¸¤å¤åèªå¤èªå·±çå¼å ³ï¼ * æ以ä¸æ¬¡åæ¢è®© 3 个å¼å ³åæ¶çæã * <p> * â ï¸ <b>ä¸è½æ³¨å ¥ {@code InhospVisitApi} æ¥å£</b>ï¼å®¹å¨éæ两个å®ç° * ï¼æ¬é¨é¢ + å é¨å®ç° {@code DefaultInhospVisitApi}ï¼ï¼æç±»åæ³¨å ¥ä¼æ§ä¹ï¼ * èä¸åªæé¨é¢æå¤å¼å ³ãQuartz ä¾èµæ¬æ¨¡åãä¸åå¨ååä¾èµï¼æ以ç´æ¥æ³¨å ¥é¨é¢æ¯å®å ¨çã */ @Autowired private com.ruoyi.inhospvisit.api.InhospVisitFacade inhospVisitFacade; /** * 宣æ模åç<b>常驻é¨é¢</b>ï¼ç¨äºå¤ {@code sys_config: publicity.enabled}ã * <p> * â ï¸ 2025 ä¿®å¤ï¼æ¬ç±»åæ¬åªå¨**çæ**宣ææ¶åå¼å ³ç®¡ï¼èµ° inhospvisit é¨é¢åè° PublicityApiï¼ï¼ * ä½**åé**宣æï¼{@link #sfHandlle} ç {@code type == 3} åæ¯ï¼ä»æ¥ä¸è¯»å®£æå¼å ³ ââ * æä»¥å ³æ {@code publicity.enabled} åï¼å·²çæç宣æåä»»å¡ç §æ ·éè¿ * çä¿¡/å ¬ä¼å·/çµè¯ååºå»ã */ @Autowired private com.ruoyi.publicity.api.PublicityFacade publicityFacade; @Value("${appid}") private String appid; @@ -195,8 +236,12 @@ @Autowired private SysConfigMapper sysConfigMapper; @Autowired private IServiceTaskScheduleService serviceTaskScheduleService; // â ï¸ 2025 移é¤ï¼å `IServiceTaskScheduleService serviceTaskScheduleService` å段ã // å®å¨æ¬ç±»é**åª**被 rollTaskGroupCycle() ç¨æ¥è° rollCycleTasks()ï¼æ»å段æ£æ¥ï¼ // æ¹åå ¨æä»¶ä» 1 å¤ä½¿ç¨ï¼ã该è°ç¨å·²åå° inhospVisitFacade.rollTaskGroupCycle()ï¼ // æ以å段è¿å¸¦å¤±æ并å é¤ ââ ççå®ä¼è®©äººè¯¯ä»¥ä¸º smartor ç rollCycleTasks è¿æ人ç¨ã // smartor 侧ç ServiceTaskScheduleServiceImpl.rollCycleTasks() æ¬èº«**ä¿çä¸å ** // ï¼å®å¯è½ä»è¢«ç°ç½å ¶å®å ¥å£/æ¥å£è°ç¨ï¼å é¤å±å¦ä¸ä»¶äºï¼ã public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("æ§è¡å¤åæ¹æ³ï¼ å符串类å{}ï¼å¸å°ç±»å{}ï¼é¿æ´å{}ï¼æµ®ç¹å{}ï¼æ´å½¢{}", s, b, l, d, i)); @@ -352,7 +397,6 @@ } } /** * å®æ¶å¤çå¤é¾çæ°æ® */ @@ -379,7 +423,6 @@ String formattedNow = now.format(formatter); dealHisData(formattedNow); } /** * HISæ°æ®éé @@ -1072,7 +1115,6 @@ } } public void dealHisDataSLTD() { log.info("ãdealHisDataãå¼å§æ§è¡HISæ°æ®ééä»»å¡"); @@ -1130,27 +1172,50 @@ /** * å¤çæ£è ä¿¡æ¯ï¼è¿å ¥åä»»å¡è¡¨ * <p> * â ï¸ 2025 ä¿®å¤ï¼å¼å ³å¤±æï¼ï¼æ¬æ¹æ³åèµ° {@code iPatMedInhospService.dealOutHospInfo(config)}ï¼ * é£æ¯ smartor éçéçå®ç°ï¼**ä¸å¤ä»»ä½æ¨¡åå¼å ³** ââ äºæ¯ï¼ * <ul> * <li>å ³ {@code inhospvisit.enabled} ç §æ ·çæåºé¢/é¿æé访ï¼</li> * <li>å ³ {@code publicity.enabled} ç §æ ·åå ¥é¢å®£æä¸è¯å宣æï¼</li> * <li>å ³ {@code othervisit.enabled} ç §æ ·çæææ¯é访ã</li> * </ul> * ç°æ¹èµ°æ¨¡åé¨é¢ï¼é¨é¢å¤ {@code inhospvisit.enabled}ï¼æ¨¡åå®ç°å é¨ååè° * {@code PublicityApi} / {@code OtherVisitApi}ï¼ä¸å¤åèªå¤èªå·±çå¼å ³ã */ public void dealOutHospInfo() { String config = configService.selectConfigByKey("visit.early.day"); if (port.equals("8095")) { //åºé¢è¡¨ iPatMedInhospService.dealOutHospInfo(config); //åºé¢è¡¨ï¼å«å ¥é¢å®£æ / è¯å宣æ / ææ¯é访 ââ åç±æ¨¡åå®ç°åè°å¯¹åºæ¨¡åé¨é¢ï¼ inhospVisitFacade.dealOutHospInfo(config); //é¨è¯è¡¨(æ°åçææ¶ä¸åé¨è¯é访) if (!active.equals("xh")) { iPatMedOuthospService.dealOutpatientInfo(); // ãé¨æ¥è¯æ¨¡åååæ¢ãé¨é¢å é¨å¤ sys_config: outpatientvisit.enabledï¼è¿è¡æ¶ç读ï¼ï¼ // å ³éæ¶è¿å 0 并æ WARNã // // â ï¸ 2025 ä¿®å¤ï¼è¿éåå æ¯ iPatMedOuthospService.dealOutpatientInfo()ï¼ // å®ç» IPatMedOuthospService â PatMedOuthospServiceDelegatingImpl // â OuthospDataFacade.dealOutpatientInfo()ï¼è**é£æ¡è·¯ä¸æ²¡æå¼å ³å®å«** ââ // OuthospVisitFacade.dealOutpatientInfo() ææ¯å¸¦å®å«çå ¥å£ï¼å´å ¨ä»é¶è°ç¨è ã // ç»ææ¯ outpatientvisit.enabled=false 对å®æ¶ä»»å¡**å®å ¨å¤±æ**ã // ç°å¨ä¸ä¸é¢ dealOperationInfo() èµ° otherVisitFacade çå½¢ç¶ä¸è´ã outhospVisitFacade.dealOutpatientInfo(); } } } /** * å¤çæ£è ä¿¡æ¯ï¼è¿å ¥åä»»å¡è¡¨(ä»»å¡ç») * <p> * â ï¸ 2025 ä¿®å¤ï¼å¼å ³å¤±æï¼ï¼åèµ° smartor éçå®ç°ï¼ä¸å¤å¼å ³ï¼å {@link #dealOutHospInfo()}ï¼ã * ç°èµ°æ¨¡åé¨é¢ã注æ模å侧ç {@code dealOutHospInfoBySchedule} å é¨ä»ä¼è½¬åå smartor * ï¼{@code OtherVisitApiBridge}ï¼è§è¯¥ç±»æ³¨éï¼ï¼ä½<b>å¼å ³å¨é¨é¢è¿ä¸å±å¤</b>ï¼æä»¥å ³éæ¶ä¸ä¼èµ°å°é£éã */ public void dealOutHospInfoBySchedule() { String config = configService.selectConfigByKey("visit.early.day"); if (port.equals("8095")) { //åºé¢è¡¨ iPatMedInhospService.dealOutHospInfoBySchedule(config); inhospVisitFacade.dealOutHospInfoBySchedule(config); //é¨è¯è¡¨(æ°åçææ¶ä¸åé¨è¯é访) // if (!active.equals("xh")) { // //iPatMedOuthospService.dealOutpatientInfo(); @@ -1158,12 +1223,13 @@ } } /** * å¤çææ¯ä¿¡æ¯ï¼è¿å ¥åä»»å¡è¡¨ */ public void dealOperationInfo() { if (port.equals("8095")) iPatMedOperationService.dealOperationInfo(); // ãææ¯æ¨¡åååæ¢ãåºå£æ¹ä¸ºè°ç¨ ruoyi-othervisit ç常驻é¨é¢ã // é¨é¢å é¨å¤ sys_config: othervisit.enabledï¼è¿è¡æ¶ç读ï¼ï¼å ³éæ¶è¿å 0 并æ WARNã if (port.equals("8095")) otherVisitFacade.dealOperationInfo(); } @@ -1177,7 +1243,10 @@ */ public void createOuthospQuarterTable() { log.info("ãcreateOuthospQuarterTableãå¼å§æ§è¡é¨è¯å表任å¡"); createDataTable.createOuthospQuarterTable(); // ãé¨è¯æ¨¡ååãCreateDataTable å·²æ´ä½è¿å ¥ ruoyi-outpatientvisit // ï¼å®ç°ä¸º OuthospPartitionMaintainerï¼ç» OuthospVisitFacade æ´é²ï¼ã // è¿éåªåè°ç¨ï¼å»ºè¡¨é»è¾ä¸è¡æªå¨ã outhospVisitFacade.createOuthospQuarterTable(); } /** @@ -1190,7 +1259,6 @@ List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp()); } } /** * é¿æä»»å¡åé @@ -1289,7 +1357,6 @@ if (StringUtils.isNotEmpty(failDay)) iServiceSubtaskService.setFailSubTaskDefalutVal(Long.valueOf(failDay)); } /** * å¤ææ¥ææ¯å¦æ¯ä»å¤© * @@ -1341,6 +1408,22 @@ } String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(sendPreachform)); // â ï¸ 2025 ä¿®å¤ï¼å®£æå¼å ³å¤±æï¼ï¼type == 3 æ¯**宣æ/éç¥**ï¼çº¯åéãæ ä½ç ââ // è§ setSuccessPreachForm éã宣ææéç¥â¦ç´æ¥æ¹æ 9ãã以åæ¬æ¹æ³åé¢ // ã宣ææéç¥ï¼åéæååç´æ¥æ¹æ 6Lãçå¤å®ï¼ï¼æ´æ¡æ´¾åçææéé // ï¼çµè¯/çä¿¡/å ¬ä¼å·/人工ï¼åçé½æ¯å®£æå 容ãå ³æ publicity.enabled æ¶åº**ä¸ä¸ªééé½ä¸å**ã // // â ï¸ å»æ**ä¸æ¨è¿ subtask ç¶æãä¹ä¸è®°å¤±è´¥**ï¼ä¸ RedisMqReceiver åå£å¾ï¼ï¼ // å ³éæ¯"ææ¶ä¸å"ï¼ä¸æ¯"è¿ä¸ªæ£è ä¸éè¦å®£æ"ãæ æ失败/ä¸éè¦ä¼è®©è¿æ¡å®£æ // å¨å¼å ³æ¢å¤åæ°¸è¿ä¸¢å¤±ãä¿æ sendstate ä¸å¨ï¼å¼å ³æå¼åä¸ä¸æ¬¡ longTaskSend/compensateTask // ä¼ç §å¸¸æå®æåºæ¥ååºã if ("3".equals(serviceSubtask.getType()) && !publicityFacade.isEnabled()) { log.warn("ã宣æã模åæªå¯ç¨ï¼åæ°é ç½® publicity.enabled=falseï¼ï¼è·³è¿å®£æåéãsubtaskId={}, patid={}", serviceSubtask.getId(), serviceSubtask.getPatid()); return; } if (descByCode.equals("çµè¯")) { List<String> list = new ArrayList<>(); ServiceTask ivrTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid()); @@ -1450,7 +1533,13 @@ sendMagParam.setContent(smsContemt.replace("${wjurl}", sendMagParam.getUrl())); } } else { HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); // â ï¸ è¿é**å»æä¸**为 TemplateModuleDisabledException åéçº§ï¼ // 模æ¿æ¨¡åå ³éï¼sys_config: template.enabled=falseï¼æ¶ï¼å®£æå 容确å®åä¸å°ï¼ // çä¿¡ä¹å°±ç¡®å®åä¸åºå»ãå¤å± try-catch ä¼å¦å®è®°ä¸º"çä¿¡åé失败"ï¼ // 并éè¿ setSuccessPreachForm(..., "5") ææ¢ææºå¶å级å°ä¸ä¸ä¸ªééï¼å ¬ä¼å·/人工ï¼ã // è¥å¨è¿é硬记æ"åéæå"ï¼çäºç¨ä¸æ¡åè®°å½æ©ç"没ååºå»"ï¼ // äºåä»ä»»å¡è®°å½ä¸å®å ¨çä¸åºé®é¢ ââ é£æ¯æ´åçé级ã HeLibrary heLibrary = templateFacade.findHeLibraryById(serviceSubtask.getLibtemplateid()); if (heLibrary.getHetype().equals("1")) { sendMagParam.setPhone(serviceSubtask.getPhone()); url = StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/xj?p=" + format : localIP + "/xj?p=" + format; @@ -1643,7 +1732,6 @@ SysDept sysDept = CollectionUtils.isNotEmpty(sysDepts) ? sysDepts.get(0) : new SysDept(); return ObjectUtils.isNotEmpty(sysDept) ? sysDept.getCampusid() : "2"; } private Date getNextVisitTime(Long subid, Long taskid, Date visitTime) { ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform(); @@ -1970,7 +2058,9 @@ } try { String config = configService.selectConfigByKey("visit.early.day"); iPatMedInhospService.dealOutHospInfoBySchedule(config); // â ï¸ 2025 ä¿®å¤ï¼å¼å ³å¤±æï¼ï¼åèµ° smartor éçå®ç°ï¼ä¸å¤å¼å ³ï¼å dealOutHospInfoï¼ã // ç°èµ°æ¨¡åé¨é¢ï¼ä¸ RyTask#dealOutHospInfo ä¸è´ã inhospVisitFacade.dealOutHospInfoBySchedule(config); log.info("ãdealTaskGroupOutHospãä»»å¡ç»é¦è½®çº³å ¥æ«æå®æ"); } catch (Exception e) { log.error("ãdealTaskGroupOutHospãä»»å¡ç»æ«æå¼å¸¸", e); @@ -1988,7 +2078,18 @@ public void rollTaskGroupCycle() { log.info("ãrollTaskGroupCycleãå¼å§æ«æ循ç¯ä»»å¡ç»"); try { int rolled = serviceTaskScheduleService.rollCycleTasks(); // â ï¸ 2025 ä¿®å¤ï¼å¼å ³å¤±æï¼ï¼åèµ° smartor ç ServiceTaskScheduleServiceImpl.rollCycleTasks()ï¼ // ä¸å¤å¼å ³ ââ å ³æ inhospvisit.enabled ç §æ ·ãæ¨è¿è½®æ¬¡ + æ°å»º subtaskãã // // ç°èµ°æ¨¡åé¨é¢ï¼å®æ模ååæ¹æ¡é第 10 æ¥ä¸ç´æ²¡åçé£ä¸æ¥åæ¢ï¼ // InhospVisitFacade#rollTaskGroupCycleï¼å¤å¼å ³ï¼ // â DefaultInhospVisitApi#rollTaskGroupCycle // â TaskGroupCycleRoller#rollCycleTasksï¼éè¡æ¬èªå L170-190ï¼ // â ScheduleRollPortBridgeï¼smartor 侧端å£å®ç°ï¼116 å段深æ·è´ççå¨å®ç°ä¾§ï¼ // 该类ç注éæç¡®åäºã第 10 æ¥åè¿æ¥ä¹åä¸è½è¢«æå°ä»»ä½è°åº¦ä¸ï¼å¦ååè·ãââ // æ¬è¡å°±æ¯é£ä¸ªåæ¢ç¹ï¼åå®èç rollCycleTasks å³éå½¹ï¼å ¨ä»åªææ¬æ¹æ³è°å®ï¼ã int rolled = inhospVisitFacade.rollTaskGroupCycle(); // é¨é¢å é¨ç TaskGroupCycleRoller å·²æãæ¬æ¬¡æ¨è¿ N 个计åãï¼è¿éåªè¡¥ä¸å¥æ»è§ log.info("ãrollTaskGroupCycleãæ¬æ¬¡æ¨è¿ {} 个计å", rolled); } catch (Exception e) { log.error("ãrollTaskGroupCycleãæ»å¨è°åº¦å¼å¸¸", e); @@ -2027,10 +2128,26 @@ } /** * å¤çè¶ æ¶éè®¿ä»»å¡ * @return * å¤çè¶ æ¶é访任å¡ï¼éè®¿è¶ æ¶ â çæ"å次é访"ï¼ * <p> * â ï¸ 2025 ä¿®å¤ï¼å¼å ³å¤±æï¼ï¼æ¬æ¹æ³åä¸å¤ä»»ä½æ¨¡åå¼å ³ ââ * å ³æ {@code inhospvisit.enabled} ç §æ ·å»º"å次é访"åä»»å¡ã * <p> * <b>为ä»ä¹è¿éæ¯"å ¥å£å¤å¼å ³"èä¸æ¯å {@link #dealOutHospInfo()} é£æ ·åå°é¨é¢</b>ï¼ * 模å侧åªæä¾äº {@code InhospVisitApi#buildAgainVisitDraft}ï¼ç»è£ è稿ï¼ï¼ * <b>没æ</b>å®æ´ç"æ«æè¶ æ¶ â è½åº â åååä»»å¡ç¶æ"å ¥å£ï¼ * èæ¬æ¹æ³èªå·±ç»è£ 并 insertï¼è§ä¸æ¹ {@code insertServiceSubtask}ï¼ã * é ä¸ä¸ªæ¨¡åå ¥å£å±äºæ°å¢è½åãè¶ åº"åªè§£å³å¼å ³"çèå´ï¼æ以åæå°æ¹å¨ï¼å ¥å£å®å«ã * <p> * â ï¸ å ¨ä»åªæ {@code ServiceSubtaskController#dealSubtaskDeadline} ä¸ä¸ªè°ç¨è ã */ public void dealSubtaskDeadline(String orgid, Integer deadlineDay){ // â ï¸ å¼å ³å®å«ï¼å å¤å干活ï¼ä¸ dealOutHospInfo / rollTaskGroupCycle åå£å¾ã // å ³éæ¶ç´æ¥è¿åï¼ä¸æ«æãä¸å»º"å次é访"åä»»å¡ã if (!inhospVisitFacade.isEnabled()) { log.warn("ãdealSubtaskDeadlineã模åæªå¯ç¨ï¼åæ°é ç½® inhospvisit.enabled=falseï¼ï¼è·³è¿è¶ æ¶é访å¤çãorgid={}", orgid); return; } //è·åä»»å¡ä¿¡æ¯ ServiceTask st = new ServiceTask(); st.setDelFlag("0"); ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CreateDataTable.java
ÎļþÒÑɾ³ý ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -153,7 +153,7 @@ <result property="filterDrcode" column="filter_drcode"/> </resultMap> <resultMap type="com.smartor.domain.PatMedInhosp" id="PatMedInhospResult"> <resultMap type="com.ruoyi.inhospvisit.domain.PatMedInhosp" id="PatMedInhospResult"> <result property="inhospid" column="inhospid"/> <result property="inhospno" column="inhospno"/> <result property="serialnum" column="serialnum"/> @@ -223,7 +223,7 @@ <result property="fuspecialadvice" column="fuspecialadvice"/> </resultMap> <resultMap type="com.smartor.domain.PatMedOuthosp" id="PatMedOuthospResult"> <resultMap type="com.ruoyi.outpatientvisit.domain.PatMedOuthosp" id="PatMedOuthospResult"> <result property="id" column="id"/> <result property="serialnum" column="serialnum"/> <result property="patidHis" column="patid"/> @@ -336,7 +336,7 @@ <result property="guid" column="guid"/> </resultMap> <resultMap type="com.smartor.domain.PatMedOperation" id="PatMedOperationResult"> <resultMap type="com.ruoyi.othervisit.domain.PatMedOperation" id="PatMedOperationResult"> <result property="id" column="id"/> <result property="patidHis" column="patid_his"/> <result property="patcode" column="patcode"/> @@ -414,7 +414,7 @@ <result property="opleveldesc" column="opleveldesc"/> </resultMap> <resultMap type="com.smartor.domain.PatMedOperationItem" id="PatMedOperationItemResult"> <resultMap type="com.ruoyi.othervisit.domain.PatMedOperationItem" id="PatMedOperationItemResult"> <result property="id" column="id"/> <result property="operationid" column="operationid"/> <result property="opid" column="opid"/> @@ -593,7 +593,7 @@ </select> <select id="selectPatMedInhospListCount" parameterType="com.smartor.domain.PatMedInhosp" resultType="Long"> <select id="selectPatMedInhospListCount" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultType="Long"> select count(*) FROM healthy_inhosp </select> @@ -617,13 +617,13 @@ WHERE row_num > #{lastRowNumber} LIMIT #{ps} </select> <select id="selectPatArchiveCount" parameterType="com.smartor.domain.PatMedInhosp" resultType="Long"> <select id="selectPatArchiveCount" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultType="Long"> select count(*) FROM healthy_archive </select> <select id="selectPatMedInhospList" parameterType="com.smartor.domain.PatMedInhosp" resultMap="PatMedInhospResult"> <select id="selectPatMedInhospList" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultMap="PatMedInhospResult"> select b.nurse_id, b.nurse_name, @@ -694,7 +694,7 @@ </select> <select id="selectPatMedOuthospList" parameterType="com.smartor.domain.PatMedOuthosp" <select id="selectPatMedOuthospList" parameterType="com.ruoyi.outpatientvisit.domain.PatMedOuthosp" resultMap="PatMedOuthospResult"> select outhospno, @@ -819,7 +819,7 @@ </select> <select id="selectOperList" parameterType="com.smartor.domain.PatMedOperation" <select id="selectOperList" parameterType="com.ruoyi.othervisit.domain.PatMedOperation" resultMap="PatMedOperationResult"> select o.patid_his, @@ -911,7 +911,7 @@ </if> </select> <select id="selectOperItemList" parameterType="com.smartor.domain.PatMedOperationItem" <select id="selectOperItemList" parameterType="com.ruoyi.othervisit.domain.PatMedOperationItem" resultMap="PatMedOperationItemResult"> select oi.operationid, ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/domain/row/SatisfactionIvrScriptRow.java
@@ -5,7 +5,7 @@ /** * 满æ度ç»è®¡ç¨çãè¯é³æ¨¡æ¿é®é¢ãåªè¯»è§å¾ã * <p> * 为ä»ä¹éè¦è¿ä¸ªç±»ï¼èä¸æ¯ç´æ¥ç¨ {@code com.smartor.domain.IvrLibaTemplateScript}ï¼ï¼ * 为ä»ä¹éè¦è¿ä¸ªç±»ï¼èä¸æ¯ç´æ¥ç¨ {@code com.ruoyi.template.domain.IvrLibaTemplateScript}ï¼ï¼ * <ul> * <li>é£ä¸ªå®ä½å±äº smartor ç**è¯é³æ¨¡æ¿ç®¡ç**ä¸å¡ï¼è¢« 9 个æ件使ç¨ï¼å«æ¨¡æ¿å¢å æ¹æ¥ï¼ï¼ä¸è½æ¬è¿æ¬æ¨¡åï¼</li> * <li>满æ度ç»è®¡å ¶å®åªç¨å°å®ç 5 个å段ï¼è§ä¸ï¼ï¼æéååæ¯æ´å¥å®ä½æ´æ¸ æ°ï¼</li> ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/domain/row/SatisfactionSvyScriptRow.java
@@ -5,7 +5,7 @@ /** * 满æ度ç»è®¡ç¨çãé®å·æ¨¡æ¿é®é¢ãåªè¯»è§å¾ã * <p> * 为ä»ä¹éè¦è¿ä¸ªç±»ï¼èä¸æ¯ç´æ¥ç¨ {@code com.smartor.domain.SvyLibTemplateScript}ï¼ï¼ * 为ä»ä¹éè¦è¿ä¸ªç±»ï¼èä¸æ¯ç´æ¥ç¨ {@code com.ruoyi.template.domain.SvyLibTemplateScript}ï¼ï¼ * <ul> * <li>é£ä¸ªå®ä½å±äº smartor ç**é®å·æ¨¡æ¿ç®¡ç**ä¸å¡ï¼è¢« 13 个æ件使ç¨ï¼å«æ¨¡æ¿å¢å æ¹æ¥ï¼ï¼ä¸è½æ¬è¿æ¬æ¨¡åï¼</li> * <li>满æ度ç»è®¡åªç¨å°å®ç 5 个å段ï¼è§ä¸ï¼ï¼</li> ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/mapper/SatisfactionScriptMapper.java
@@ -16,7 +16,7 @@ * <p> * <b>为ä»ä¹ä¸å¤ç¨ smartor ç模æ¿/åç±» Mapperï¼</b> * <ul> * <li>{@code com.smartor.domain.IvrLibaScriptAssort} / {@code IvrLibaTemplateScript} / * <li>{@code com.ruoyi.template.domain.IvrLibaScriptAssort} / {@code IvrLibaTemplateScript} / * {@code SvyLibScriptCategory} / {@code SvyLibTemplateScript} è¿ 4 个å®ä½å±äº * smartor ç**模æ¿ä¸å类管ç**ä¸å¡ï¼åå«è¢« 11/9/12/13 个æ件使ç¨ï¼å«å¢å æ¹æ¥ï¼ï¼ * ä¸è½æ¬è¿æ¬æ¨¡åï¼</li> smartor/pom.xml
@@ -169,6 +169,60 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi-satisfaction</artifactId> </dependency> <!-- åºå ¥é¢é访模åï¼smartor åªéè¿å®ç对å¤é¨é¢ InhospVisitFacade 触ååºå ¥é¢é访 ï¼RyTask å®æ¶ä»»å¡ + PatMedInhospController æå¨è§¦åï¼ï¼ä¸ç´æ¥ä¾èµå ¶å é¨ Service/Mapperã æ¬æ¨¡ååè¿æ¥è¦"建é访任å¡"æ¶èµ° ruoyi-common éä¸æ²ç VisitTaskCreateApiï¼ ç± smartor 侧æä¾è¿æ¸¡å®ç° VisitTaskCreateApiBridgeã 注æï¼ruoyi-inhospvisit åªä¾èµ ruoyi-commonï¼å æ¤ä¸ä¼ä¸æ¬æ¨¡åå½¢æ循ç¯ä¾èµã --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-inhospvisit</artifactId> </dependency> <!-- 宣æ模åï¼smartor åªéè¿å®ç对å¤é¨é¢ PublicityFacade 触å宣æã 注æï¼ruoyi-publicity åªä¾èµ ruoyi-commonï¼å æ¤ä¸ä¼ä¸æ¬æ¨¡åå½¢æ循ç¯ä¾èµã --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-publicity</artifactId> </dependency> <!-- é¨æ¥è¯é访模åï¼smartor åªéè¿å®ç对å¤é¨é¢è§¦åé¨è¯é访ã 注æï¼ruoyi-outpatientvisit åªä¾èµ ruoyi-commonï¼å æ¤ä¸ä¼ä¸æ¬æ¨¡åå½¢æ循ç¯ä¾èµã ï¼æ¬æ¨¡åç ServiceTaskMatchApiBridge / VisitTaskCreateApiBridge æ¯å®éè¦ç ruoyi-common å¥çº¦å¨ smartor 侧çè¿æ¸¡å®ç°ï¼æ¹åä»æ¯ smartor -> æ°æ¨¡åãï¼ --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-outpatientvisit</artifactId> </dependency> <!-- å ¶ä»é访模åï¼ææ¯é访ï¼ï¼smartor åªéè¿å®çé¨é¢è§¦åææ¯é访ã 注æï¼ruoyi-othervisit åªä¾èµ ruoyi-commonï¼å æ¤ä¸ä¼ä¸æ¬æ¨¡åå½¢æ循ç¯ä¾èµã ï¼æ¬æ¨¡åç ServiceTaskMatchApiBridge / VisitTaskCreateApiBridge ç æ¯å®éè¦ç ruoyi-common å¥çº¦å¨ smartor 侧çè¿æ¸¡å®ç°ãï¼ --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-othervisit</artifactId> </dependency> <!-- 模æ¿æ¨¡åï¼å®£ææ¨¡æ¿ / è¯é³æ¨¡æ¿ / é®å·æ¨¡æ¿ / æ¹æ¡åºçå¯ä¸å®ç°å¤ã 注æï¼ruoyi-template åªä¾èµ ruoyi-commonï¼å æ¤ä¸ä¼ä¸æ¬æ¨¡åå½¢æ循ç¯ä¾èµã æ跨模åæ°æ®è®¿é®ååï¼æ¨¡æ¿æ°æ®ï¼he_library / svy_lib_template / ivr_liba_template â¦ï¼ ä¸å¾ç»å®çé¨é¢ TemplateFacade åç¨ï¼å ¶å®æ¨¡åä¸å¾èªå·±å SQLã --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-template</artifactId> </dependency> </dependencies>
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/config/PhoneUtils.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/BaseDictOperation.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/BaseTag.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/BaseTagcategory.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/DTO/AiMatcherDto.java
@@ -1,6 +1,6 @@ package com.smartor.domain.DTO; import com.smartor.domain.IvrTaskTemplateTargetoption; import com.ruoyi.template.domain.IvrTaskTemplateTargetoption; import lombok.Data; import java.util.List; smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeCategory.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeLibrary.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeLibraryAssort.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeLibraryAssortVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeLibraryTag.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeLocallibrary.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/HeTaskVO.java
@@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import com.ruoyi.template.domain.HeLibraryVO; /** * 宣æä»»å¡å¯¹è±¡ he_task * smartor/src/main/java/com/smartor/domain/Icd10Association.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaExtemplateCategory.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaExtemplatescript.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaScript.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaScriptTag.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaScriptTarget.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaScriptTargetoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssort.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssortVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTag.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTargetoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrLibaTemplatetargetAssort.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrTaskTemplate.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrTaskTemplateTargetoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/IvrTaskTemplateVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedInhospVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedOperation.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedOuthospError.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedOuthospProvisional.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedOuthospQueryReq.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedReq.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/PatMedRes.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/QuestionMessage.java
@@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import com.ruoyi.template.domain.IvrTaskTemplateScriptVO; @Data public class QuestionMessage { // //é¢å·targetId smartor/src/main/java/com/smartor/domain/QuestionMessagePhone.java
@@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import com.ruoyi.template.domain.IvrLibaTemplateScriptVO; @Data public class QuestionMessagePhone { // //é¢å·targetId smartor/src/main/java/com/smartor/domain/SchemeLocallibrary.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/ServiceSubTaskCacheReq.java
@@ -6,6 +6,8 @@ import java.util.List; import com.ruoyi.template.domain.IvrTaskTemplateScriptVO; import com.ruoyi.template.domain.SvyTaskTemplateScriptVO; /** * çµè¯é®é¢åçæç» * smartor/src/main/java/com/smartor/domain/ServiceSubTaskMYDAnswerReq.java
@@ -6,6 +6,7 @@ import java.util.List; import com.ruoyi.template.domain.SvyTaskTemplateScriptVO; /** * çµè¯é®é¢åçæç» * smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -2,10 +2,12 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -128,6 +130,27 @@ private String scriptids; /** * æ scriptidsï¼éå·åéçé®é¢IDå符串ï¼ä¸¥æ ¼è§£æ为 Long éåï¼ä» ä¾ SQL ç foreach é¢ç¼è¯ä½¿ç¨ã * <p> * åªä¿ç纯æ°å项ï¼å ¶ä½å 容ä¸å¾ä¸¢å¼ï¼è¿å null 表示âä¸è¿æ»¤âã * è¿æ · scriptids è¿ä¸ªè¯·æ±å段永è¿ä¸ä¼è¢«æ¼æ¥è¿ SQLï¼é¿å æ³¨å ¥ï¼åå®ç°æ¯ in (${scriptids})ï¼ã */ @JsonIgnore public List<Long> getScriptidList() { if (scriptids == null || scriptids.trim().isEmpty()) { return null; } List<Long> scriptidList = new ArrayList<>(); for (String item : scriptids.split(",")) { String scriptid = item.trim(); if (scriptid.matches("\\d+")) { scriptidList.add(Long.valueOf(scriptid)); } } return scriptidList.isEmpty() ? null : scriptidList; } /** * åç»ç±»å drCode, deptCode, leaveHospitalDistrictCode */ @ApiModelProperty(value = "åç»ç±»å") smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailVO.java
@@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; import com.ruoyi.template.domain.SvyTaskTemplateTargetoption; /** * è¯é³ä»»å¡å¼å«æç»å¯¹è±¡ ivr_taskcalldetail * smartor/src/main/java/com/smartor/domain/ServiceSubtaskTemplateVO.java
@@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; import com.ruoyi.template.domain.SvyTaskTemplateVO; /** * åä»»å¡é®å·æ¨¡æ¿ * smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -11,6 +11,8 @@ import java.util.List; import java.util.Map; import com.ruoyi.template.domain.IvrTaskTemplateVO; import com.ruoyi.template.domain.SvyTaskTemplateVO; /** * è¯é³ä»»å¡å¯¹è±¡ ivr_task * smartor/src/main/java/com/smartor/domain/SvyCategory.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyCategoryVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyFinish.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyFinishoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyFinishtopic.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibException.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibResult.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibScript.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibScriptCategory.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibScriptOption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibScriptRes.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibScriptTag.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateCategory.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateCategoryVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateReq.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptWjx.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateTag.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoptionWjx.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTemplateWjx.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTopicAndOptionRes.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyLibTopicdirection.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTaskScript.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTaskScriptoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTaskTemplateTargetoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTaskTemplateVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTopic.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTopicReq.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/SvyTopicoption.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/TemplateDept.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/TemplateDeptVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/TemplateSmsRequest.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/BaseDictOperationMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/BaseTagMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/BaseTagcategoryMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/HNGatherPatArchiveMapper.java
@@ -7,6 +7,8 @@ import com.ruoyi.common.core.domain.entity.SysUserRole; import com.ruoyi.common.enums.DataSourceType; import com.smartor.domain.*; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param;
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/HeLibraryAssortMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/HeLibraryMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/HeLibraryTagMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/HeLocallibraryMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/Icd10AssociationMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaExtemplateCategoryMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaExtemplateMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaExtemplatescriptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaScriptAssortMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaScriptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTagMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTargetMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTargetoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTargetAssortMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTargetTagMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateAssortMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateScriptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateTagMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateTargetoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrTaskTemplateMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrTaskTemplateScriptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/IvrTaskTemplateTargetoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/PatMedOuthospErrorMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/PatMedOuthospMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/PatMedOuthospProvisionalMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SchemeLocallibraryMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -1,7 +1,7 @@ package com.smartor.mapper; import com.smartor.domain.*; import com.smartor.domain.VO.HeLibraryCountVO; import com.ruoyi.template.domain.VO.HeLibraryCountVO; import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO; import com.smartor.domain.entity.ServiceSubtaskEntity; import org.apache.ibatis.annotations.MapKey; @@ -12,6 +12,8 @@ import java.util.List; import java.util.Map; import com.ruoyi.common.core.service.dto.PatMedReq; import com.ruoyi.common.core.service.dto.PatMedRes; /** * åä¸ä»»å¡ï¼é访ï¼Mapperæ¥å£ * smartor/src/main/java/com/smartor/mapper/ServiceSubtaskPreachformMapper.java
@@ -3,16 +3,48 @@ import java.util.List; import com.smartor.domain.ServiceSubtask; import org.apache.ibatis.annotations.Mapper; import com.smartor.domain.ServiceSubtaskPreachform; /** * ã请填ååè½å称ãMapperæ¥å£ * é访åä»»å¡ãæ§è¡æ¹å¼æç»ãï¼{@code service_subtask_preachform}ï¼ââ <b>è¿æ¸¡æ¥å£</b>ã * * @author lihu * @date 2025-09-15 * <h3>â ï¸ æ¬æ¥å£å·²ä¸åæ¯ MyBatis Mapper</h3> * è¿å¼ 表çå½å±æ¨¡åæ¯ {@code ruoyi-inhospvisit}ãæãå模åç¬å èªå·±çæ°æ®è®¿é®ãååï¼ * 该表ç读åå·²æ¶å£å°è¯¥æ¨¡åç {@code com.ruoyi.common.core.service.PreachformApi}ï¼ * <ul> * <li><b>æ¬æ¥å£å·²å»æ {@code @Mapper} 注解</b>ï¼é å¥ç * {@code mapper/smartor/ServiceSubtaskPreachformMapper.xml} <b>ä¹å·²å é¤</b> * ââ åä¸ä¸ªè¡¨ä¸è½åæä¸¤å¥ SQLï¼æ¹ä¸è¾¹å°±ä¸å¦ä¸è¾¹æ¼ç§»ï¼ï¼</li> * <li>ç± {@link com.smartor.mapper.impl.ServiceSubtaskPreachformMapperBridge} * å®ç°ï¼éæ¹æ³å§æå°æ¨¡å APIï¼</li> * <li>ä¿çæ¬æ¥å£æ¯ä¸ºäºè®©<b>11 个è°ç¨æ件é¶æ¹å¨</b>ï¼å®ä»¬æ³¨å ¥çä»æ¯è¿ä¸ªç±»åï¼ã</li> * </ul> * * <h3>â ï¸ å»æ {@code @Mapper} 注解并<b>ä¸è½</b>让å®æ³¨é</h3> * {@code RuoYiApplication} ä¸åçæ¯ {@code @MapperScan(value = "com.smartor.mapper")} * ââ<b>æå æ«æ</b>ï¼ä¸æ³¨è§£æ å ³ãå æ¤æ¬æ¥å£ä»ä¼è¢«æ³¨åæä¸ä¸ª * <b>空ç MyBatis 代ç Bean</b>ï¼ååå°±å« {@code serviceSubtaskPreachformMapper}ï¼ï¼ * èè°ç¨æ¹å段åæ°å¥½ä¹æ¯å®ï¼Spring å¤åéæ¶ä¼æååå½ä¸è¿ä¸ªç©ºä»£çï¼ * è°ç¨å³æ {@code BindingException: Invalid bound statement (not found)}ã * <p> * ç®åç± {@code ServiceSubtaskPreachformMapperBridge} ä¸ç {@code @Primary} å ä½ * ï¼primary å¤å®æ©äºæåååéï¼ï¼<b>é£ä¸ªæ³¨è§£ä¸è½å </b>ã * <p> * è¦çæ£æ¶é¤è¿ä¸ªç©ºä»£çï¼åªè½äºè ä¹ä¸ï¼ * <ul> * <li>æ¶ç´§æ«æï¼{@code @MapperScan(value = "com.smartor.mapper", annotationClass = Mapper.class)}ï¼ * å¹¶ç» smartor é 27 个æ¼æ {@code @Mapper} çè Mapper è¡¥ä¸æ³¨è§£ï¼</li> * <li>æææ¬æ¥å£ç§»åº {@code com.smartor.mapper} å ï¼è¯¥æ«ææ¯éå½çï¼åå æ æï¼ã</li> * </ul> * * <h3>å°æ¥å¨ä½</h3> * è°ç¨æ¹éæ¥æ¹ä¸ºç´æ¥æ³¨å ¥ {@code PreachformApi} åï¼æ¬æ¥å£ä¸ Bridge å³å¯æ´ä½å é¤ã * æ°ä»£ç <b>请ç´æ¥æ³¨å ¥ {@code PreachformApi}</b>ï¼ä¸è¦åä¾èµæ¬æ¥å£ã * * @deprecated ç¨ {@code com.ruoyi.common.core.service.PreachformApi} 代æ¿ã * ä¿çä» ä¸ºå ¼å®¹æ¢æè°ç¨æ¹ï¼æ°ä»£ç ä¸è¦ä½¿ç¨ã */ @Mapper @Deprecated public interface ServiceSubtaskPreachformMapper { /** smartor/src/main/java/com/smartor/mapper/SvyCategoryMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyFinishMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyFinishoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyFinishtopicMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibExceptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibResultMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibScriptCategoryMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibScriptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibScriptOptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibScriptTagMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTemplateCategoryMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTemplateMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTemplateScriptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTemplateScriptWjxMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTemplateTagMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTemplateTargetoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTemplateTargetoptionWjxMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTemplateWjxMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyLibTopicdirectionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyTaskScriptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyTaskScriptoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyTaskTemplateMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyTaskTemplateScriptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyTaskTemplateTargetoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyTopicMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/SvyTopicoptionMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/mapper/TemplateDeptMapper.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/DingTalkService.java
@@ -2,7 +2,7 @@ import com.ruoyi.common.core.domain.DingTalkReqVo; import com.ruoyi.common.core.service.IDingTalkService; import com.smartor.domain.HeCategory; import com.ruoyi.template.domain.HeCategory; import com.taobao.api.ApiException; import org.springframework.web.bind.annotation.RequestBody;
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IBaseSmsaccountService.java
@@ -8,7 +8,7 @@ import com.smartor.domain.BaseSmsRequest; import com.smartor.domain.BaseSmsaccount; import com.smartor.domain.BatchBaseSmsRequest; import com.smartor.domain.TemplateSmsRequest; import com.ruoyi.template.domain.TemplateSmsRequest; import org.springframework.web.bind.annotation.PathVariable; /** smartor/src/main/java/com/smartor/service/IBaseTagService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IBaseTagcategoryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IHNGatherPatArchiveService.java
@@ -3,6 +3,8 @@ import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.smartor.domain.*; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import org.springframework.web.multipart.MultipartFile; import java.util.List; smartor/src/main/java/com/smartor/service/IHeCategoryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IHeLibraryAssortService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IHeLibraryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IHeLibraryTagService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IHeLocallibraryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIcd10AssociationService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaExtemplateCategoryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaExtemplateService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaExtemplatescriptService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaScriptAssortService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaScriptService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaScriptTagService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaScriptTargetService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaScriptTargetoptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTargetAssortService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTargetTagService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTargetoptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTemplateAssortService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTemplateScriptService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTemplateService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTemplateTagService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrLibaTemplateTargetoptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrTaskTemplateScriptService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrTaskTemplateService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IIvrTaskTemplateTargetoptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
@@ -2,13 +2,17 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.service.dto.PatMedReq; import com.ruoyi.common.core.service.dto.PatMedRes; import com.smartor.domain.*; import com.smartor.domain.DTO.PatMedInhospDTO; import com.ruoyi.inhospvisit.domain.PatMedInhospDTO; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; import com.ruoyi.inhospvisit.domain.PatMedInhospVO; import com.ruoyi.inhospvisit.domain.PatMedInhosp; /** * æ£è ä½é¢è®°å½Serviceæ¥å£ * @@ -35,11 +39,6 @@ public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp); public List<PatMedInhospDTO> selectPatMedInhospByApplication(PatMedInhosp patMedInhosp); /** * åºé¢ãé¨è¯äººæ°åé访éç»è®¡ï¼å¨ï¼æï¼å¹´ï¼ */ public Map<String, Integer> queryPersonCount(PatServiceCount patServiceCount); /** * æ¥è¯¢å½åç»é人èªå·±ï¼ç åºãé¨é¨ï¼çæ£è ä½é¢è®°å½å表 @@ -128,4 +127,56 @@ public void addOperationSubTask(String config); public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, Integer type); // ========================================================================== // åºå ¥é¢é访模ååï¼ç¬¬ä¸æ¹ï¼ââ ä¾ VisitTaskCreateApiBridge / OtherVisitApiBridge å¤ç¨çè¿æ¸¡å ¥å£ // // â ï¸ è¿ 3 个æ¹æ³æ¯<b>å»ææ°å¢</b>çè¿æ¸¡æå ¥å£ï¼çº¯è½¬åï¼é¶ä¸å¡é»è¾ï¼ï¼ // ä¸æ¯è¯¯å ãä¹ä¸è¦"顺æå æ"ï¼ // · runOperationVisit(config) ââ 让 OtherVisitApiBridge æ个"é访è½å"å½¢ç¶çå ¥å£ // · persistSubtask(subtask) ââ 让 VisitTaskCreateApiBridge æå¯ä¸çè½åºå ¥å£ // · selectPendingDeptPatientsForVisit() ââ 让 PatMedInhospController åå°æ°å ¥å£å // ä»è½æå表交ç»é¢å¤/é¨è¯å并 // ç± sql/_probe/verify_step16_service_restore.py ä¸ audit_worktree_changes.py ç»è®°æå ³ã // ========================================================================== /** * ãè¿æ¸¡æç¨ãææ¯é访æ«æã * <p> * ä¸ {@link #addOperationSubTask(String)} <b>å®å ¨çä»·</b>ï¼æ¬æ¹æ³å°±æ¯è½¬åå°å®ï¼ï¼ * åå¨çå¯ä¸çç±æ¯ç» {@code OtherVisitApiBridge} ä¸ä¸ª"çèµ·æ¥å±äºé访è½å"çå ¥å£ï¼ * 让ææ¯é访å°æ¥æ¬å» {@code ruoyi-othervisit} æ¶åªæ¢å®ç°æ¹ã * <p> * 注æï¼{@code addOperationSubTask} <b>ä¸è½å </b> ââ å®è¢« * {@code PatMedInhospController#addOperationSubTask}ï¼URL ä¸åï¼ç´æ¥è°ç¨ã * * @param config {@code sys_config: visit.early.day} * @return å¤ççææ¯è®°å½æ° */ int runOperationVisit(String config); /** * ãè¿æ¸¡æç¨ãæãç§å®¤ç»´åº¦æªå¤ççå¨é¢æ£è ãå表读åºæ¥ã * <p> * ä¾ {@code PatMedInhospController#dealOutHospInfo}ï¼URL ä¸åï¼å¨åæ¢å°æ°å ¥å£å * ä»è½æåè¡¨äº¤ç» {@code IPatMedOuthospService} å"é¢å¤é¨è¯ + å¨é¢"å并ã * <p> * æ¡ä»¶ä¸å {@code dealOutHospInfo} ç第ä¸æ®µæ¥è¯¢<b>å®å ¨ä¸è´</b>ï¼ * {@code deptcheck_flag='0'} + {@code inhospstate='1'} + {@code fuflag='1'}ã * å®ç°æ¯çº¯è½¬åï¼{@code selectPatMedInhospList}ï¼ï¼é¶é»è¾æ¹å¨ã * * @return ç§å®¤ç»´åº¦æªå¤ççå¨é¢æ£è */ List<PatMedInhosp> selectPendingDeptPatientsForVisit(); /** * ãè¿æ¸¡æç¨ãæä¸æ¡å·²ç»è£ 好çåä»»å¡è½åºã * <p> * åç¬æ½åºæ¥ççç±ï¼è®© {@code VisitTaskCreateApiBridge} æä¸ä¸ªå¯æ§çåå ¥å£ï¼ * 便äº"æ¬è¿ååéè¡çä»·"çæ¢éæ¯å¯¹ï¼å°æ¥ãé访任å¡å建模åãæ¥ç®¡æ¶æ¿æ¢å®ç°æ¹ã * * @param serviceSubtask å·²ç»è£ 好çåä»»å¡ï¼è°ç¨æ¹è´è´£å¡«å ¨åæ®µï¼ * @return true = è½åºæå */ boolean persistSubtask(ServiceSubtask serviceSubtask); } smartor/src/main/java/com/smartor/service/IPatMedOperationItemService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IPatMedOperationService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IPatMedOuthospProvisionalService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISchemeLocallibraryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/IServicePhoneService.java
@@ -1,7 +1,7 @@ package com.smartor.service; import com.smartor.domain.*; import com.smartor.domain.VO.HeLibraryCountVO; import com.ruoyi.template.domain.VO.HeLibraryCountVO; import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO; import com.smartor.domain.VO.TransferDeptVO; import com.smartor.domain.entity.ServiceSubtaskEntity; smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -11,6 +11,8 @@ import java.util.List; import java.util.Map; import com.ruoyi.template.domain.VO.HeLibraryCountVO; import com.ruoyi.template.domain.IvrTaskTemplateTargetoption; /** * åä¸ä»»å¡ï¼é访ï¼Serviceæ¥å£ * @@ -225,7 +227,18 @@ public Integer matchOptionIndex(String url, String questionText, String voiceText, List<IvrTaskTemplateTargetoption> options, String uuid); /** * AI é项å¹é ï¼æ options åºååå POST å°å¤é¨ AI æå¡ï¼ã * <p> * â ï¸ å ¥åæ¹æ<b>æ³å</b> {@code List<T>}ï¼å为 {@code List<IvrTaskTemplateTargetoption>}ï¼ï¼ * é£ä¸ªç±»åå·²é模æ¿æ¨¡ååæ¬è¿ {@code ruoyi-template}ï¼èæ¬æ¹æ³è¦ç» * {@code SubtaskOptionMatchApiBridge} å模æ¿æ¨¡åæ´é²ï¼æ¥å£å¨ ruoyi-commonï¼ã * æ³å让模æ¿æ¨¡åä¸å¿ ç¥é {@code T} æ¯ä»ä¹ï¼åæ¶ä¿æ smartor å é¨ 4 å¤è°ç¨ç¹å½¢ç¶ä¸åã * <p> * è¯ä¹æ ååï¼æ¹æ³ä½åªå {@code jsonObject.put("options", options)} åæ´ä½åºååï¼ * ä»ä¸è¯» {@code T} çå段ã */ public <T> Integer matchOptionIndex(String url, String questionText, String voiceText, List<T> options, String uuid); } smartor/src/main/java/com/smartor/service/IServiceTaskService.java
@@ -3,10 +3,10 @@ import java.util.List; import java.util.Map; import com.smartor.domain.IvrLibaTemplateScriptVO; import com.ruoyi.template.domain.IvrLibaTemplateScriptVO; import com.smartor.domain.ServiceSubtask; import com.smartor.domain.ServiceTask; import com.smartor.domain.SvyLibTemplateScriptVO; import com.ruoyi.template.domain.SvyLibTemplateScriptVO; /** * è¯é³ä»»å¡Serviceæ¥å£ smartor/src/main/java/com/smartor/service/ISvyCategoryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyFinishService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyFinishoptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyFinishtopicService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibExceptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibResultService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibScriptCategoryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibScriptOptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibScriptService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibScriptTagService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibTemplateCategoryService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibTemplateScriptService.java
@@ -2,7 +2,7 @@ import com.smartor.domain.ServiceSubtaskCountReq; import com.smartor.domain.ServiceSubtaskScriptCount; import com.smartor.domain.SvyLibTemplateScript; import com.ruoyi.template.domain.SvyLibTemplateScript; import java.util.List; import java.util.Map; smartor/src/main/java/com/smartor/service/ISvyLibTemplateScriptWjxService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibTemplateService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibTemplateTagService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibTemplateTargetoptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibTemplateTargetoptionWjxService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibTemplateWjxService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyLibTopicdirectionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyTaskScriptService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyTaskScriptoptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyTaskService.java
@@ -1,7 +1,7 @@ package com.smartor.service; import com.smartor.domain.IvrLibaTemplateScriptVO; import com.smartor.domain.SvyLibTemplateScriptVO; import com.ruoyi.template.domain.IvrLibaTemplateScriptVO; import com.ruoyi.template.domain.SvyLibTemplateScriptVO; import com.smartor.domain.SvyTask; import java.util.List; smartor/src/main/java/com/smartor/service/ISvyTaskTemplateScriptService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyTaskTemplateService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyTaskTemplateTargetoptionService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ISvyTopicService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/ITemplateDeptService.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/PersonWorkbenchService.java
@@ -1,6 +1,6 @@ package com.smartor.service; import com.smartor.domain.BaseTag; import com.ruoyi.template.domain.BaseTag; import com.smartor.domain.PerSonWorkbenchDto; import java.util.List; smartor/src/main/java/com/smartor/service/impl/BaseDictOperationServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/BaseSmsaccountServiceImpl.java
@@ -10,7 +10,7 @@ import com.smartor.domain.BaseSmsRequest; import com.smartor.domain.BaseSmsaccount; import com.smartor.domain.BatchBaseSmsRequest; import com.smartor.domain.TemplateSmsRequest; import com.ruoyi.template.domain.TemplateSmsRequest; import com.smartor.mapper.BaseSmsaccountMapper; import com.smartor.service.IBaseSmsaccountService; import org.springframework.beans.factory.annotation.Autowired; smartor/src/main/java/com/smartor/service/impl/BaseTagServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/BaseTagcategoryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/HNGatherPatArchiveServiceImpl.java
@@ -6,7 +6,11 @@ import com.ruoyi.common.core.domain.entity.SysUserRole; import com.ruoyi.common.utils.StringUtils; import com.smartor.domain.*; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.api.InhospVisitFacade; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.smartor.mapper.*; import com.ruoyi.outpatientvisit.mapper.PatMedOuthospMapper; import com.smartor.service.IHNGatherPatArchiveService; import com.smartor.service.IPatMedOuthospService; import lombok.extern.slf4j.Slf4j; @@ -51,7 +55,7 @@ private PatMedOuthospMapper patMedOuthospMapper; @Autowired private PatMedInhospMapper patMedInhospMapper; private InhospVisitFacade inhospVisitFacade; @Autowired private PatArchiveMapper patArchiveMapper; @@ -109,20 +113,20 @@ //å ¥é¢ pm.setInhospstate("0"); pm.setCreateTime(new Date()); patMedInhospMapper.insertPatMedInhosp(pm); inhospVisitFacade.insertPatMedInhosp(pm); } else if (!Objects.isNull(patMedInhosp.getStartOutHospTime()) && !Objects.isNull(patMedInhosp.getEndOutHospTime())) { //åºé¢ pm.setInhospstate("1"); pm.setUpdateTime(new Date()); PatMedInhosp pmi = new PatMedInhosp(); pmi.setSerialnum(pm.getSerialnum()); List<PatMedInhosp> patMedInhospList1 = patMedInhospMapper.selectPatMedInhospList(pmi); List<PatMedInhosp> patMedInhospList1 = inhospVisitFacade.selectPatMedInhospList(pmi); if (CollectionUtils.isEmpty(patMedInhospList1)) { pm.setCreateTime(new Date()); patMedInhospMapper.insertPatMedInhosp(pm); inhospVisitFacade.insertPatMedInhosp(pm); } else { pm.setInhospid(patMedInhospList1.get(0).getInhospid()); patMedInhospMapper.updatePatMedInhosp(pm); inhospVisitFacade.updatePatMedInhosp(pm); } } smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/HeLibraryTagServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/HeLocallibraryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/Icd10AssociationServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaExtemplateCategoryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaExtemplateServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaExtemplatescriptServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTagServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetoptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetTagServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetoptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateScriptServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateTagServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateTargetoptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateScriptServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateTargetoptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -7,8 +7,12 @@ import com.ruoyi.common.utils.DtoConversionUtils; import com.ruoyi.common.utils.StringUtils; import com.smartor.domain.*; import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.smartor.domain.entity.ServiceSubtaskEntity; import com.smartor.mapper.*; import com.ruoyi.outpatientvisit.mapper.PatMedOuthospMapper; import com.smartor.service.IPatArchiveService; import com.smartor.service.IPatMedInhospService; import com.smartor.service.IPatMedOuthospService; @@ -39,6 +43,8 @@ import java.util.concurrent.Executors; import java.util.stream.Collectors; import com.ruoyi.template.domain.BaseTag; import com.ruoyi.template.mapper.BaseTagMapper; /** * æ£è æ¡£æ¡Serviceä¸å¡å±å¤ç * smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -1,17 +1,21 @@ package com.smartor.service.impl; import com.ruoyi.othervisit.api.OtherVisitFacade; import com.ruoyi.inhospvisit.api.InhospVisitFacade; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.service.IConfigService; import com.ruoyi.common.core.service.dto.PatMedReq; import com.ruoyi.common.core.service.dto.PatMedRes; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DtoConversionUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.smartor.common.ScheduleSubtaskBuilder; import com.smartor.domain.*; import com.smartor.domain.DTO.PatMedInhospDTO; import com.ruoyi.inhospvisit.domain.PatMedInhospDTO; import com.smartor.domain.entity.ServiceSubtaskEntity; import com.smartor.mapper.*; import com.smartor.service.IPatMedInhospService; @@ -28,6 +32,9 @@ import java.util.*; import java.util.stream.Collectors; import com.ruoyi.othervisit.domain.PatMedOperationItem; import com.ruoyi.inhospvisit.domain.PatMedInhospVO; import com.ruoyi.inhospvisit.domain.PatMedInhosp; /** * æ£è ä½é¢è®°å½Serviceä¸å¡å±å¤ç * @@ -38,7 +45,13 @@ @Service public class PatMedInhospServiceImpl implements IPatMedInhospService { @Autowired private PatMedInhospMapper patMedInhospMapper; private InhospVisitFacade inhospVisitFacade; /** * ææ¯æ°æ®ä¸å¾ç» ruoyi-othervisit çé¨é¢åç¨ï¼è·¨æ¨¡åæ°æ®è®¿é®ååï¼ã */ @Autowired private OtherVisitFacade otherVisitFacade; @Autowired private ServiceTaskdeptMapper serviceTaskdeptMapper; @Autowired @@ -57,8 +70,6 @@ private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper; @Autowired private ServiceTaskmedicalMapper serviceTaskmedicalMapper; @Autowired private PatMedOperationItemMapper patMedOperationItemMapper; @Autowired private ServiceTaskRuleMapper serviceTaskRuleMapper; @@ -83,12 +94,12 @@ */ @Override public PatMedInhosp selectPatMedInhospByInhospid(Long inhospid) { return patMedInhospMapper.selectPatMedInhospByInhospid(inhospid); return inhospVisitFacade.selectPatMedInhospByInhospid(inhospid); } @Override public List<PatMedInhosp> selectPatMedInhosp(PatMedInhosp patMedInhosp) { return patMedInhospMapper.selectPatMedInhosp(patMedInhosp); return inhospVisitFacade.selectPatMedInhosp(patMedInhosp); } /** @@ -115,7 +126,7 @@ patMedInhosp.setInhospstate("3"); } List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); fillTagname(patMedInhospList); return patMedInhospList; } @@ -149,7 +160,7 @@ int batchSize = 1000; for (int i = 0; i < patidList.size(); i += batchSize) { List<Long> batch = patidList.subList(i, Math.min(i + batchSize, patidList.size())); List<Map<String, Object>> rows = patMedInhospMapper.getTagnameByPatids(batch); List<Map<String, Object>> rows = inhospVisitFacade.getTagnameByPatids(batch); if (CollectionUtils.isEmpty(rows)) { continue; } @@ -205,19 +216,6 @@ return patMedInhospDTOList; } @Override public Map<String, Integer> queryPersonCount(PatServiceCount patServiceCount) { if (patServiceCount.getInterval() == 1) { //å¨ } else if (patServiceCount.getInterval() == 2) { //æ } else if (patServiceCount.getInterval() == 3) { //å¹´ } return null; } /** * æ¥è¯¢å½åç»é人èªå·±ï¼ç åºãé¨é¨ï¼çæ£è ä½é¢è®°å½å表 * @@ -225,7 +223,7 @@ * @return */ public List<PatMedInhosp> selectPatMedInhospListByCondition(PatMedInhospVO patMedInhospVO) { return patMedInhospMapper.selectPatMedInhospListByCondition(patMedInhospVO); return inhospVisitFacade.selectPatMedInhospListByCondition(patMedInhospVO); } @@ -258,7 +256,7 @@ public PatMedRes selectPatMedInhospListCount(PatMedReq patMedReq) { PatMedRes patMedRes = null; // è·åå½åç»é人çé¨é¨æé patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq); patMedRes = inhospVisitFacade.selectPatMedInhospCount(patMedReq); return patMedRes; } @@ -272,7 +270,7 @@ public int insertPatMedInhosp(PatMedInhosp patMedInhosp) { patMedInhosp.setCreateTime(DateUtils.getNowDate()); patMedInhosp.setUpdateTime(DateUtils.getNowDate()); return patMedInhospMapper.insertPatMedInhosp(patMedInhosp); return inhospVisitFacade.insertPatMedInhosp(patMedInhosp); } /** @@ -284,7 +282,7 @@ @Override public int updatePatMedInhosp(PatMedInhosp patMedInhosp) { patMedInhosp.setUpdateTime(DateUtils.getNowDate()); return patMedInhospMapper.updatePatMedInhosp(patMedInhosp); return inhospVisitFacade.updatePatMedInhosp(patMedInhosp); } /** @@ -295,7 +293,7 @@ */ @Override public int deletePatMedInhospByInhospids(Long[] inhospids) { return patMedInhospMapper.deletePatMedInhospByInhospids(inhospids); return inhospVisitFacade.deletePatMedInhospByInhospids(inhospids); } /** @@ -306,7 +304,7 @@ */ @Override public int deletePatMedInhospByInhospid(Long inhospid) { return patMedInhospMapper.deletePatMedInhospByInhospid(inhospid); return inhospVisitFacade.deletePatMedInhospByInhospid(inhospid); } /** @@ -317,7 +315,7 @@ */ @Override public int deletePatMedInhospByInhospno(String inhospno) { return patMedInhospMapper.deletePatMedInhospByInhospno(inhospno); return inhospVisitFacade.deletePatMedInhospByInhospno(inhospno); } @Override @@ -326,7 +324,7 @@ pmks.setDeptcheckFlag("0"); pmks.setInhospstate("1"); pmks.setFuflag("1"); List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks); List<PatMedInhosp> patMedInhosps = inhospVisitFacade.selectPatMedInhospList(pmks); //1.å ¥é¢å®£æ String helibrarySwitch = iSysConfigService.selectConfigByKey("in.helibrary.switch"); @@ -339,7 +337,7 @@ if (Objects.isNull(patArchive)) { patMedInhosp1.setInDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("æ£è åºæ¬ä¿¡æ¯ä¸ºç©º"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); continue; } try { @@ -353,10 +351,10 @@ List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept); //å¦æé¨é¨æ¨¡æ¿ä¸ºç©ºï¼å°deptIsNull设置为trueï¼ if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); patMedInhosp1.setInDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + "该æ£è æå¨ç§å®¤æªé ç½®å ¥é¢é¿æ宣æä»»å¡;" : "该æ£è æå¨ç§å®¤æªé ç½®å ¥é¢é¿æ宣æä»»å¡;"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } else { for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) { writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 4, config); @@ -367,7 +365,7 @@ log.error("人åå ¥é¢ç§å®¤å¤çåºå¼å¸¸äºï¼{}", e.getMessage()); patMedInhosp1.setInDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("人åå ¥é¢ç§å®¤å¤çåºå¼å¸¸äº"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } } @@ -376,14 +374,14 @@ pmks.setInDeptcheckFlag(null); pmks.setInWardcheckFlag("0"); pmks.setDeptcheckFlag(null); List<PatMedInhosp> inPatMedInhospsWard = patMedInhospMapper.selectPatMedInhospList(pmks); List<PatMedInhosp> inPatMedInhospsWard = inhospVisitFacade.selectPatMedInhospList(pmks); for (PatMedInhosp patMedInhosp1 : inPatMedInhospsWard) { //è·åæ£è ä¿¡æ¯ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid()); if (Objects.isNull(patArchive)) { patMedInhosp1.setInDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("æ£è åºæ¬ä¿¡æ¯ä¸ºç©º"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); continue; } //æ ¹æ®æ£è æå¨ç åºï¼è·å该ç åºçå ¥é¢é¿æ宣æä»»å¡ï¼ä¼åºç°ä¸ä¸ªé®é¢ï¼ç§å®¤åç åºåçåä¸ä¸ªæ¨¡æ¿ï¼ @@ -396,10 +394,10 @@ List<ServiceTaskdept> serviceTaskWardList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskWard); //å¦æé¨é¨æ¨¡æ¿ä¸ºç©ºï¼å°deptIsNull设置为trueï¼ if (CollectionUtils.isEmpty(serviceTaskWardList) || serviceTaskWardList.size() == 0) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); patMedInhosp1.setInDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "该æ£è æå¨ç åºæªé ç½®å ¥é¢é¿æ宣æä»»å¡;"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } else { for (ServiceTaskdept serviceTaskdept1 : serviceTaskWardList) { writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 5, config); @@ -455,7 +453,7 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setDeptcheckFlag("0"); patMedInhosp.setInhospstate("0"); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) { dealInHospInfo(patMedInhospList); } @@ -524,7 +522,7 @@ patMedInhospVo.setLeaveldeptcodes(deptCodeList); patMedInhospVo.setLeavehospitaldistrictcodes(wardCodeList); patMedInhospVo.setIcd10codeList(icd10CodeList); List<PatMedInhosp> patList = patMedInhospMapper.selectPatMedInhospList(patMedInhospVo); List<PatMedInhosp> patList = inhospVisitFacade.selectPatMedInhospList(patMedInhospVo); log.info("dealOutHospInfoBySchedule ä»»å¡ç»é访, taskid = {}, æ«ææ£è äººæ° {}", serviceTask.getTaskid(), patList.size()); for (PatMedInhosp patMedInhosp : patList) { @@ -554,7 +552,7 @@ PatMedInhosp flagUpd = new PatMedInhosp(); flagUpd.setInhospid(patMedInhosp.getInhospid()); flagUpd.setScheduleCheckFlag("1"); patMedInhospMapper.updatePatMedInhosp(flagUpd); inhospVisitFacade.updatePatMedInhosp(flagUpd); } } else { //ä»»å¡ç» - ææ¯é访 @@ -568,7 +566,7 @@ pmoi.setOpLevelCodes(opLevelCodeList); //æ¯æ¬¡æ¥è¯¢åªæ¥æ大çææ¯ççº§è®°å½ List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemListMaxLevel(pmoi); List<PatMedOperationItem> patMedOperationItems = otherVisitFacade.selectOperationItemListMaxLevel(pmoi); for (PatMedOperationItem patMedOperationItem : patMedOperationItems) { PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperationItem.getPatid()); if (Objects.isNull(patArchive)) { @@ -579,7 +577,7 @@ patMedInhospVo.setScheduleCheckFlag("0"); patMedInhospVo.setInhospstate("1"); patMedInhospVo.setFuflag("1"); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhospVo); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhospVo); if (CollectionUtils.isNotEmpty(patMedInhospList)) { ServiceTaskScheduleDetail scheduleDetailVo = new ServiceTaskScheduleDetail(); scheduleDetailVo.setTaskid(serviceTask.getTaskid()); @@ -601,7 +599,7 @@ PatMedInhosp flagUpd = new PatMedInhosp(); flagUpd.setInhospid(patMedInhospList.get(0).getInhospid()); flagUpd.setScheduleCheckFlag("1"); patMedInhospMapper.updatePatMedInhosp(flagUpd); inhospVisitFacade.updatePatMedInhosp(flagUpd); } } } @@ -628,9 +626,9 @@ @Override public List<PatMedInhosp> getDocAndPat(PatMedInhosp patMedInhosp) { List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } if (StringUtils.isNotEmpty(patMedInhosp.getPatname()) || StringUtils.isNotEmpty(patMedInhosp.getNurseName()) || StringUtils.isNotEmpty(patMedInhosp.getDrname())) { @@ -693,34 +691,34 @@ log.info("该æ£è è¯å宣æé¿æä»»å¡ä¸åå¨,ä»»å¡ID为ï¼{}", taskid); patMedInhosp1.setMedcheckFlag("2"); patMedInhosp1.setLongTaskReason(longTaskReason + " & 该æ£è è¯å宣æé¿æä»»å¡ä¸åå¨,ä»»å¡ID为:" + taskid); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); return; } if (type == 1) { log.info("该æ£è åºé¢é访é¿æä»»å¡ä¸åå¨,ä»»å¡ID为ï¼{}", taskid); patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason(longTaskReason + " & 该æ£è 离é¢ç§å®¤é¿æä»»å¡ä¸åå¨,ä»»å¡ID为:" + taskid); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); return; } else if (type == 2) { patMedInhosp1.setWardcheckFlag("2"); patMedInhosp1.setLongTaskReason(longTaskReason + " & 该æ£è 离é¢ç åºé¿æä»»å¡ä¸åå¨,ä»»å¡ID为:" + taskid); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); return; } else if (type == 3) { patMedInhosp1.setDiagcheckFlag("2"); patMedInhosp1.setLongTaskReason(longTaskReason + " & 该æ£è ç¾ç é¿æä»»å¡ä¸åå¨,ä»»å¡ID为:" + taskid); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); return; } else if (type == 4) { patMedInhosp1.setInDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason(longTaskReason + " & 该æ£è å ¥é¢ç§å®¤é¿æä»»å¡ä¸åå¨,ä»»å¡ID为:" + taskid); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); return; } else if (type == 5) { patMedInhosp1.setInWardcheckFlag("2"); patMedInhosp1.setLongTaskReason(longTaskReason + " & 该æ£è å ¥é¢ç åºé¿æä»»å¡ä¸åå¨,ä»»å¡ID为:" + taskid); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); return; } } else { @@ -883,7 +881,7 @@ if (type == 3) patMedInhosp2.setDiagcheckFlag("1"); if (type == 4) patMedInhosp2.setInDeptcheckFlag("1"); if (type == 5) patMedInhosp2.setInWardcheckFlag("1"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp2); inhospVisitFacade.updatePatMedInhosp(patMedInhosp2); } else { //çæåä»»å¡å¤±è´¥ï¼ log.info("çæåä»»å¡å¤±è´¥serviceSubtaskçtaskid为ï¼{},patid为ï¼{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid()); @@ -895,7 +893,7 @@ if (type == 4) patMedInhosp2.setInDeptcheckFlag("2"); if (type == 5) patMedInhosp2.setInWardcheckFlag("2"); patMedInhosp2.setRemark("çæåä»»å¡å¤±è´¥ " + type); patMedInhospMapper.updatePatMedInhosp(patMedInhosp2); inhospVisitFacade.updatePatMedInhosp(patMedInhosp2); } } catch (Exception e) { //åºéåæ»äºå¡ @@ -907,7 +905,7 @@ if (type == 3) patMedInhosp2.setDiagcheckFlag("2"); if (type == 0) patMedInhosp2.setMedcheckFlag("2"); patMedInhosp2.setRemark("çæåä»»å¡æ¥éåæ» " + type); patMedInhospMapper.updatePatMedInhosp(patMedInhosp2); inhospVisitFacade.updatePatMedInhosp(patMedInhosp2); e.printStackTrace(); } } @@ -934,7 +932,7 @@ log.info("该ææ¯å¯¹åºææ¯ç级çé¿æä»»å¡ä¸åå¨,ä»»å¡ID为ï¼{}", taskid); patMedOperationItem.setOpercheckFlag("2"); patMedOperationItem.setLongTaskReason(" & 该ææ¯å¯¹åºææ¯ç级çé¿æä»»å¡ä¸åå¨,ä»»å¡ID为:" + taskid +";"); patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem); otherVisitFacade.updateOperationItem(patMedOperationItem); return; } else { serviceTask = serviceTasks.get(0); @@ -957,7 +955,7 @@ if(!active.equals("hzszlyy")){ patMedInhosp.setSerialnum(patMedOperationItem.getSerialnum()); } List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); if (CollectionUtils.isEmpty(patMedInhospList)) { return; @@ -1032,7 +1030,7 @@ PatMedOperationItem patMedOperationItem2 = new PatMedOperationItem(); patMedOperationItem2.setId(patMedOperationItem.getId()); patMedOperationItem2.setOpercheckFlag("1"); patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem2); otherVisitFacade.updateOperationItem(patMedOperationItem2); } else { //çæåä»»å¡å¤±è´¥ï¼ log.info("çæåä»»å¡å¤±è´¥serviceSubtaskçtaskid为ï¼{},patid为ï¼{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid()); @@ -1041,7 +1039,7 @@ patMedOperationItem2.setOpercheckFlag("2"); patMedOperationItem2.setLongTaskReason("çæåä»»å¡å¤±è´¥ 4;"); patMedOperationItem2.setUpdateTime(new Date()); patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem2); otherVisitFacade.updateOperationItem(patMedOperationItem2); } } catch (Exception e) { //åºéåæ»äºå¡ @@ -1053,7 +1051,7 @@ patMedOperationItem2.setOpercheckFlag("2"); patMedOperationItem2.setUpdateTime(new Date()); patMedOperationItem2.setLongTaskReason("çæåä»»å¡æ¥éåæ» 4;"); patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem2); otherVisitFacade.updateOperationItem(patMedOperationItem2); e.printStackTrace(); } } @@ -1173,7 +1171,7 @@ if (type != 4 && type != 5) { patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 该æ£è ç¾ç åºé¢æ¶é´ä¸ºç©º,åºé¢è®°å½ID为:" + patMedInhosp1.getInhospid()); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); //å¦æåºé¢æ¶é´ä¸ºç©ºï¼åè¿åä¸ä¸ªæ°å¯¹è±¡ return new ServiceSubtask(); } @@ -1273,10 +1271,10 @@ } else { patMedOperationItem.setOpercheckFlag("2"); patMedOperationItem.setLongTaskReason("该æ£è ææ¯åºé¢æ¶é´ä¸ºç©º,ææ¯è¯¦æ ID为:" + patMedOperationItem.getId() + ";"); patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem); otherVisitFacade.updateOperationItem(patMedOperationItem); // patMedInhosp1.setDeptcheckFlag("2"); // patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 该æ£è ææ¯åºé¢æ¶é´ä¸ºç©º,åºé¢è®°å½ID为:" + patMedInhosp1.getInhospid()); // patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); // inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); //å¦æåºé¢æ¶é´ä¸ºç©ºï¼åè¿åä¸ä¸ªæ°å¯¹è±¡ return null; } @@ -1370,7 +1368,7 @@ pmoi.setMainFlag("1"); //æ¯æ¬¡æ¥è¯¢åªæ¥æ大çææ¯ççº§è®°å½ List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemListMaxLevel(pmoi); List<PatMedOperationItem> patMedOperationItems = otherVisitFacade.selectOperationItemListMaxLevel(pmoi); log.info("dealOutHospInfoéè¦å¤ççåºé¢ææ¯æ£è ä¿¡æ¯ï¼{}", CollectionUtils.isNotEmpty(patMedOperationItems) ? patMedOperationItems.size() : null); for (PatMedOperationItem opItem : patMedOperationItems) { @@ -1407,11 +1405,11 @@ serviceTaskopers.addAll(serviceTaskopersWard); //å¦æé¨é¨æ¨¡æ¿ä¸ºç©ºï¼å°deptIsNull设置为trueï¼ if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) { PatMedOperationItem patMedOperationItem = patMedOperationItemMapper.selectPatMedOperationItemById(opItem.getId()); PatMedOperationItem patMedOperationItem = otherVisitFacade.selectOperationItemById(opItem.getId()); patMedOperationItem.setOpercheckFlag("2"); patMedOperationItem.setLongTaskReason("ææ£çææ¯æªé ç½®é¿æä»»å¡;"); patMedOperationItem.setUpdateTime(new Date()); patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem); otherVisitFacade.updateOperationItem(patMedOperationItem); } else { for (ServiceTaskoper serviceTaskoper : serviceTaskopers) { writeInSubTaskForOp(serviceTaskoper.getTaskId(), true, opItem, config); @@ -1424,7 +1422,7 @@ opItem.setUpdateTime(new Date()); opItem.setOpercheckFlag("2"); opItem.setLongTaskReason("人åææ¯å¤çå¼å¸¸"); patMedOperationItemMapper.updatePatMedOperationItem(opItem); otherVisitFacade.updateOperationItem(opItem); } } } @@ -1435,10 +1433,10 @@ pmjb.setDiagcheckFlag("0"); pmjb.setInhospstate("1"); pmjb.setFuflag("1"); List<PatMedInhosp> patMedInhospJBs = patMedInhospMapper.selectPatMedInhospList(pmjb); List<PatMedInhosp> patMedInhospJBs = inhospVisitFacade.selectPatMedInhospList(pmjb); log.info("dealOutHospInfoéè¦å¤ççåºé¢ç¾ç æ£è ä¿¡æ¯ï¼{}", CollectionUtils.isNotEmpty(patMedInhospJBs) ? patMedInhospJBs.size() : null); for (PatMedInhosp patMedInhosp1 : patMedInhospJBs) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } @@ -1448,7 +1446,7 @@ if (Objects.isNull(patArchive)) { pmiJB.setDiagcheckFlag("2"); pmiJB.setLongTaskReason("æ£è åºæ¬ä¿¡æ¯ä¸ºç©º"); patMedInhospMapper.updatePatMedInhosp(pmiJB); inhospVisitFacade.updatePatMedInhosp(pmiJB); continue; } try { @@ -1477,16 +1475,16 @@ //å¦æé¨é¨æ¨¡æ¿ä¸ºç©ºï¼å°deptIsNull设置为trueï¼ if (StringUtils.isNotEmpty(errorIcd)) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(pmiJB.getInhospid()); pmiJB.setDiagcheckFlag("2"); pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd); patMedInhospMapper.updatePatMedInhosp(pmiJB); inhospVisitFacade.updatePatMedInhosp(pmiJB); } else if (CollectionUtils.isEmpty(serviceTaskdiags)) { errorIcd = "该æ£è ææ£ç¾ç æªé ç½®é¿æä»»å¡;"; PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(pmiJB.getInhospid()); pmiJB.setDiagcheckFlag("2"); pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd); patMedInhospMapper.updatePatMedInhosp(pmiJB); inhospVisitFacade.updatePatMedInhosp(pmiJB); } else { int flag = 0; for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) { @@ -1502,10 +1500,10 @@ if (flag == 0) { log.error("该ç§å®¤æç åºå¯¹äºæ£è ææ£ç¾ç æªé ç½®é¿æä»»å¡,æ£è ï¼{}", pmiJB.getInhospid()); errorIcd = "该ç§å®¤æç åºå¯¹äºæ£è ææ£ç¾ç æªé ç½®é¿æä»»å¡;"; PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(pmiJB.getInhospid()); pmiJB.setDiagcheckFlag("2"); pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd); patMedInhospMapper.updatePatMedInhosp(pmiJB); inhospVisitFacade.updatePatMedInhosp(pmiJB); } } @@ -1515,7 +1513,7 @@ log.error("人åç¾ç å¤çåºå¼å¸¸äºï¼{}", e.getMessage()); pmiJB.setDiagcheckFlag("2"); pmiJB.setLongTaskReason("人åç¾ç å¤çå¼å¸¸"); patMedInhospMapper.updatePatMedInhosp(pmiJB); inhospVisitFacade.updatePatMedInhosp(pmiJB); } } } @@ -1526,10 +1524,10 @@ pmbq.setWardcheckFlag("0"); pmbq.setInhospstate("1"); pmbq.setFuflag("1"); List<PatMedInhosp> patMedInhospBQs = patMedInhospMapper.selectPatMedInhospList(pmbq); List<PatMedInhosp> patMedInhospBQs = inhospVisitFacade.selectPatMedInhospList(pmbq); log.info("dealOutHospInfoéè¦å¤ççåºé¢ç åºæ£è ä¿¡æ¯ï¼{}", CollectionUtils.isNotEmpty(patMedInhospBQs) ? patMedInhospBQs.size() : null); for (PatMedInhosp patMedInhosp1 : patMedInhospBQs) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } @@ -1538,7 +1536,7 @@ if ("1".equals(pmiBQ1.getLeavehospitaldistrictcode()) && pmiBQ1.getDiagcheckFlag().equals("1")) { pmiBQ1.setWardcheckFlag("2"); pmiBQ1.setLongTaskReason("æ ¹æ®äº¤åçæé访任å¡è§åï¼ç åºä»»å¡å¯ä»¥ä¸ç¨çæ"); patMedInhospMapper.updatePatMedInhosp(pmiBQ1); inhospVisitFacade.updatePatMedInhosp(pmiBQ1); continue; } @@ -1547,7 +1545,7 @@ if (Objects.isNull(patArchive)) { pmiBQ1.setWardcheckFlag("2"); pmiBQ1.setLongTaskReason("æ£è åºæ¬ä¿¡æ¯ä¸ºç©º"); patMedInhospMapper.updatePatMedInhosp(pmiBQ1); inhospVisitFacade.updatePatMedInhosp(pmiBQ1); continue; } try { @@ -1569,10 +1567,10 @@ } //å¦æé¨é¨æ¨¡æ¿ä¸ºç©ºï¼å°deptIsNull设置为trueï¼ if (StringUtils.isNotEmpty(errorreason)) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiBQ1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(pmiBQ1.getInhospid()); pmiBQ1.setWardcheckFlag("2"); pmiBQ1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorreason : errorreason); patMedInhospMapper.updatePatMedInhosp(pmiBQ1); inhospVisitFacade.updatePatMedInhosp(pmiBQ1); } else { for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) { writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2, config); @@ -1584,7 +1582,7 @@ log.error("人åç åºå¤çåºå¼å¸¸äºï¼{}", e.getMessage()); pmiBQ1.setWardcheckFlag("2"); pmiBQ1.setLongTaskReason("人åç åºå¤çå¼å¸¸"); patMedInhospMapper.updatePatMedInhosp(pmiBQ1); inhospVisitFacade.updatePatMedInhosp(pmiBQ1); } } } @@ -1595,10 +1593,10 @@ pmks.setDeptcheckFlag("0"); pmks.setInhospstate("1"); pmks.setFuflag("1"); List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks); List<PatMedInhosp> patMedInhosps = inhospVisitFacade.selectPatMedInhospList(pmks); log.info("dealOutHospInfoéè¦å¤ççåºé¢é¨é¨æ£è ä¿¡æ¯ï¼{}", CollectionUtils.isNotEmpty(patMedInhosps) ? patMedInhosps.size() : null); for (PatMedInhosp patMedInhosp1 : patMedInhosps) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } @@ -1607,7 +1605,7 @@ if ("1".equals(patMedInhosp1.getLeavehospitaldistrictcode()) && patMedInhosp1.getDiagcheckFlag().equals("1")) { patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("æ ¹æ®äº¤åçæé访任å¡è§åï¼é¨é¨ä»»å¡å¯ä»¥ä¸ç¨çæ"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); continue; } //è·åæ£è ä¿¡æ¯ @@ -1615,7 +1613,7 @@ if (Objects.isNull(patArchive)) { patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("æ£è åºæ¬ä¿¡æ¯ä¸ºç©º"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); continue; } try { @@ -1629,10 +1627,10 @@ List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept); //å¦æé¨é¨æ¨¡æ¿ä¸ºç©ºï¼å°deptIsNull设置为trueï¼ if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "该æ£è æå¨ç§å®¤æªé 置离é¢é¿æä»»å¡;"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } else { for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) { writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config); @@ -1644,7 +1642,7 @@ log.error("人åç§å®¤å¤çåºå¼å¸¸äºï¼{}", e.getMessage()); patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("人åç§å®¤å¤çå¼å¸¸"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } } } @@ -1680,7 +1678,7 @@ if (StringUtils.isNotEmpty(remark)) { updateObj.setRemark(remark + " (type=" + type + ")"); } patMedInhospMapper.updatePatMedInhosp(updateObj); inhospVisitFacade.updatePatMedInhosp(updateObj); } /** @@ -1695,7 +1693,7 @@ if (Objects.isNull(patArchive)) { patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("æ£è åºæ¬ä¿¡æ¯ä¸ºç©º"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); continue; } @@ -1841,7 +1839,7 @@ log.error("ãåºäºè§åãæ£è {}å¤çå¼å¸¸ï¼{}", patMedInhosp1.getInhospid(), e.getMessage()); patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("åºäºè§åå¤çå¼å¸¸"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } } } @@ -1864,12 +1862,12 @@ List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept); if (CollectionUtils.isEmpty(serviceTaskdepts)) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setWardcheckFlag(patMedInhosp.getWardcheckFlag()); patMedInhosp1.setDiagcheckFlag(patMedInhosp.getDiagcheckFlag()); patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "该æ£è æå¨ç§å®¤æªé 置离é¢é¿æä»»å¡;"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } else { for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) { writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config); @@ -1881,7 +1879,7 @@ log.error("ãç§å®¤ä»»å¡ãæ£è {}å¤çå¼å¸¸ï¼{}", patMedInhosp1.getInhospid(), e.getMessage()); patMedInhosp1.setDeptcheckFlag("2"); patMedInhosp1.setLongTaskReason("ç§å®¤ä»»å¡å¤çå¼å¸¸"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } return generatedCount; } @@ -1912,12 +1910,12 @@ } if (StringUtils.isNotEmpty(errorreason)) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); patMedInhosp1.setWardcheckFlag("2"); patMedInhosp1.setDeptcheckFlag(patMedInhosp.getDeptcheckFlag()); patMedInhosp1.setDiagcheckFlag(patMedInhosp.getDiagcheckFlag()); patMedInhosp1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorreason : errorreason); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } else { for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) { writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 2, config); @@ -1929,7 +1927,7 @@ log.error("ãç åºä»»å¡ãæ£è {}å¤çå¼å¸¸ï¼{}", patMedInhosp1.getInhospid(), e.getMessage()); patMedInhosp1.setWardcheckFlag("2"); patMedInhosp1.setLongTaskReason("ç åºä»»å¡å¤çå¼å¸¸"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } return generatedCount; } @@ -1952,10 +1950,10 @@ if (active.equals("nhfy")) { serviceTaskdiag.setIcd10name(patMedInhosp1.getLeavediagname()); if (StringUtils.isEmpty(patMedInhosp1.getLeavediagname())) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); patMedInhosp1.setDiagcheckFlag("2"); patMedInhosp1.setLongTaskReason("该æ£è 主è¯æå称为空;"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); return 0; } } else { @@ -1965,10 +1963,10 @@ List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagListByIcdName(serviceTaskdiag); if (CollectionUtils.isEmpty(serviceTaskdiags)) { PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); patMedInhosp.setDiagcheckFlag("2"); patMedInhosp.setLongTaskReason("该æ£è ææ£ç¾ç æªé ç½®é¿æä»»å¡;"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp); inhospVisitFacade.updatePatMedInhosp(patMedInhosp); } else { int flag = 0; for (ServiceTaskdiag serviceTaskdiag1 : serviceTaskdiags) { @@ -1984,10 +1982,10 @@ } if (flag == 0) { log.error("该ç§å®¤æç åºå¯¹äºæ£è ææ£ç¾ç æªé ç½®é¿æä»»å¡,æ£è ï¼{}", patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid()); patMedInhosp.setDiagcheckFlag("2"); patMedInhosp.setLongTaskReason("该ç§å®¤æç åºå¯¹äºæ£è ææ£ç¾ç æªé ç½®é¿æä»»å¡;"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp); inhospVisitFacade.updatePatMedInhosp(patMedInhosp); } } } catch (Exception e) { @@ -1995,10 +1993,52 @@ log.error("ãç¾ç ä»»å¡ãæ£è {}å¤çå¼å¸¸ï¼{}", patMedInhosp1.getInhospid(), e.getMessage()); patMedInhosp1.setDiagcheckFlag("2"); patMedInhosp1.setLongTaskReason("ç¾ç ä»»å¡å¤çå¼å¸¸"); patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); } return generatedCount; } // ========================================================================== // åºå ¥é¢é访模ååï¼ç¬¬ä¸æ¹ï¼ââ 3 个è¿æ¸¡æå ¥å£ï¼çº¯è½¬åï¼é¶ä¸å¡é»è¾ï¼ // // â ï¸ è¿ 3 个æ¹æ³æ¯å»ææ°å¢çï¼ä¸æ¯è¯¯å ï¼ // è§ IPatMedInhospService éååçæ¥å£å£°æ注éï¼ä»¥å // sql/_probe/verify_step16_service_restore.py ç expected_added æè¨ã // ========================================================================== /** * ãè¿æ¸¡æç¨ãææ¯é访æ«æ ââ ä¸ {@link #addOperationSubTask(String)} å®å ¨çä»·ã * <p> * â ï¸ {@code addOperationSubTask} åå®ç°è¿å {@code void}ï¼æ以è¿éæ"å¤çäº 1 è½®"è¿å 1ï¼ * ä» ç¨äºæ¥å¿ï¼<b>è°ç¨æ¹ä¸å¾ä¾èµè¯¥è¿åå¼çä¸å¡å«ä¹</b>ã */ @Override public int runOperationVisit(String config) { addOperationSubTask(config); return 1; } /** * ãè¿æ¸¡æç¨ãç§å®¤ç»´åº¦æªå¤ççå¨é¢æ£è ã * <p> * æ¡ä»¶ä¸å {@code dealOutHospInfo} 第ä¸æ®µæ¥è¯¢éåä¸è´ï¼ * {@code deptcheckFlag="0"} + {@code inhospstate="1"} + {@code fuflag="1"}ã */ @Override public List<PatMedInhosp> selectPendingDeptPatientsForVisit() { PatMedInhosp pmks = new PatMedInhosp(); pmks.setDeptcheckFlag("0"); pmks.setInhospstate("1"); pmks.setFuflag("1"); return inhospVisitFacade.selectPatMedInhospList(pmks); } /** * ãè¿æ¸¡æç¨ãæä¸æ¡å·²ç»è£ 好çåä»»å¡è½åºï¼å {@code serviceSubtaskMapper.insertServiceSubtask}ï¼ã */ @Override public boolean persistSubtask(ServiceSubtask serviceSubtask) { return serviceSubtaskMapper.insertServiceSubtask(serviceSubtask) == 1; } } smartor/src/main/java/com/smartor/service/impl/PatMedOperationItemServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/PatMedOuthospProvisionalServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/PersonVoiceServiceImpl.java
@@ -29,6 +29,14 @@ import java.nio.ByteBuffer; import java.nio.file.Files; import com.ruoyi.template.domain.SvyLibTemplateScriptWjx; import com.ruoyi.template.domain.SvyLibTemplateTargetoptionWjx; import com.ruoyi.template.domain.SvyLibTopicdirection; import com.ruoyi.template.mapper.SvyLibTemplateScriptWjxMapper; import com.ruoyi.template.mapper.SvyLibTemplateTargetoptionWjxMapper; import com.ruoyi.template.mapper.SvyLibTopicdirectionMapper; import com.ruoyi.template.domain.SvyLibTemplateWjx; import com.ruoyi.template.mapper.SvyLibTemplateWjxMapper; /** * çä¿¡è´¦å·Serviceä¸å¡å±å¤ç * smartor/src/main/java/com/smartor/service/impl/PersonWorkbenchServiceImpl.java
@@ -1,10 +1,10 @@ package com.smartor.service.impl; import com.smartor.domain.PatMedOuthosp; import com.smartor.domain.PatMedOuthospQueryReq; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq; import com.smartor.domain.PerSonWorkbenchDto; import com.smartor.mapper.PatArchiveOutMapper; import com.smartor.mapper.PatMedOuthospMapper; import com.ruoyi.outpatientvisit.mapper.PatMedOuthospMapper; import com.smartor.service.PersonWorkbenchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; smartor/src/main/java/com/smartor/service/impl/SchemeLocallibraryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/ServicPhoneServiceImpl.java
@@ -18,10 +18,10 @@ import com.ruoyi.system.service.ISysConfigService; import com.smartor.common.FtpService; import com.smartor.common.ScheduleSubtaskBuilder; import com.smartor.config.PhoneUtils; import com.ruoyi.common.utils.PhoneUtils; import com.smartor.domain.DTO.ServiceSubtaskDetailDTO; import com.smartor.domain.*; import com.smartor.domain.VO.HeLibraryCountVO; import com.ruoyi.template.domain.VO.HeLibraryCountVO; import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO; import com.smartor.domain.VO.TransferDeptVO; import com.smartor.domain.entity.ServiceSubtaskEntity; smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1,5 +1,7 @@ package com.smartor.service.impl; import com.ruoyi.othervisit.api.OtherVisitFacade; import com.ruoyi.inhospvisit.api.InhospVisitFacade; import cn.hutool.core.bean.BeanUtil; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -35,6 +37,12 @@ import java.util.*; import java.util.stream.Collectors; import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq; import com.ruoyi.othervisit.domain.PatMedOperationItem; import com.ruoyi.outpatientvisit.mapper.PatMedOuthospMapper; import com.ruoyi.othervisit.domain.PatMedOperation; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; /** * 主é®Serviceä¸å¡å±å¤ç * @@ -46,6 +54,12 @@ public class ServiceExternalServiceImpl implements IServiceExternalService { @Autowired private SysDept2Mapper sysDeptMapper; /** * ææ¯æ°æ®ä¸å¾ç» ruoyi-othervisit çé¨é¢åç¨ï¼è·¨æ¨¡åæ°æ®è®¿é®ååï¼ã */ @Autowired private OtherVisitFacade otherVisitFacade; @Autowired private SysUser2Mapper sysUserMapper; @Autowired @@ -57,11 +71,7 @@ @Autowired private PatArchivecontactMapper patArchivecontactMapper; @Autowired private PatMedInhospMapper patMedInhospMapper; @Autowired private PatMedOperationMapper patMedOperationMapper; @Autowired private PatMedOperationItemMapper patMedOperationItemMapper; private InhospVisitFacade inhospVisitFacade; @Autowired private PatMedInspectionMapper patMedInspectionMapper; @Autowired @@ -483,9 +493,9 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } if (CollectionUtils.isNotEmpty(patMedInhospList)) { @@ -498,7 +508,7 @@ patMedInhosp1.setOperatorId(ObjectUtils.isNotEmpty(JiuZhenXX.get("CaoZuoRID")) ? JiuZhenXX.get("CaoZuoRID").toString() : null); } patMedInhosp1.setUpdateTime(new Date()); int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); if (i != 1) return false; } return true; @@ -577,9 +587,9 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } PatMedInhosp patMedInhosp1 = new PatMedInhosp(); @@ -694,7 +704,7 @@ //ä¸éè¦é¿æä»»å¡é访 patMedInhosp1.setFuflag("0"); } int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); if (i != 1) return false; } else { if (ObjectUtils.isNotEmpty(BingRenXX)) { @@ -718,7 +728,7 @@ patMedInhosp1.setFuflag("0"); } int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.insertPatMedInhosp(patMedInhosp1); if (i != 1) return false; } return true; @@ -776,9 +786,9 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } PatMedInhosp patMedInhosp1 = new PatMedInhosp(); @@ -860,7 +870,7 @@ //ä¸éè¦é¿æä»»å¡é访 patMedInhosp1.setFuflag("0"); } int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); if (i != 1) return false; } else { if (ObjectUtils.isNotEmpty(BingRenXX)) { @@ -883,7 +893,7 @@ //ä¸éè¦é¿æä»»å¡é访 patMedInhosp1.setFuflag("0"); } int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.insertPatMedInhosp(patMedInhosp1); if (i != 1) return false; } return true; @@ -898,9 +908,9 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } if (CollectionUtils.isNotEmpty(patMedInhospList)) { @@ -914,7 +924,7 @@ patMedInhosp1.setOperatorId(ObjectUtils.isNotEmpty(JiuZhenXX.get("CaoZuoRXM")) ? JiuZhenXX.get("CaoZuoRID").toString() : null); } patMedInhosp1.setUpdateTime(new Date()); int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); //åæ¶åºé¢ï¼å°±ä¸éè¦æå¡äºï¼éè¦éè¿patidåsendstate=2æè sendstate=1å»æ¥è¯¢ä¸ä¸ï¼service_subtaskéæ¯å¦ææ£å¨æ§è¡çä»»å¡ï¼æçè¯ï¼ç«å³åäº ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity(); @@ -998,9 +1008,9 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } Map<String, Object> JiuZhenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiuZhenXX") : null; @@ -1084,7 +1094,7 @@ if (CollectionUtils.isNotEmpty(patMedInhospList)) { patMedInhosp1.setUpdateTime(new Date()); patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null); int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); if (i != 1) return false; } else { if (ObjectUtils.isNotEmpty(BingRenXX)) { @@ -1103,7 +1113,7 @@ patMedInhosp1.setPatname(patArchive.getName()); patMedInhosp1.setCreateTime(new Date()); int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.insertPatMedInhosp(patMedInhosp1); if (i != 1) return false; } @@ -1138,7 +1148,7 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); PatMedInhosp patMedInhosp1 = null; if (CollectionUtils.isNotEmpty(patMedInhospList)) patMedInhosp1 = patMedInhospList.get(0); if (ObjectUtils.isNotEmpty(patMedInhosp1)) { @@ -1149,7 +1159,7 @@ patMedInhosp1.setUpdateTime(new Date()); //æ´æ°åºé¢ç¶æ patMedInhosp1.setInhospstate("1"); int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); int i = inhospVisitFacade.updatePatMedInhosp(patMedInhosp1); if (i != 1) return false; } catch (ParseException e) { e.printStackTrace(); @@ -1418,7 +1428,7 @@ patMedOperation.setPatid(patArchive.getId()); patMedOperation.setOpreqcode(externalOperationInfo.getShenQingDID()); //æ¥è¯¢ä¸ä¸ï¼è¯¥æ£è æ¯å¦å·²ç»æè¿äºæ°æ® List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation); List<PatMedOperation> patMedOperations = otherVisitFacade.selectOperationList(patMedOperation); patMedOperation.setOpsstatus(null); if (ObjectUtils.isNotEmpty(externalOperationInfo)) { @@ -1495,10 +1505,10 @@ //åæ¶å»æ¥è¯¢ï¼æ¯å¦å¨subtaskä¸çæä»»å¡ï¼å¦æçæåºå¾ç«é©¬å é¤ } patMedOperation.setUpdateTime(new Date()); patMedOperationMapper.updatePatMedOperation(patMedOperation); otherVisitFacade.updateOperation(patMedOperation); } else { patMedOperation.setCreateTime(new Date()); patMedOperationMapper.insertPatMedOperation(patMedOperation); otherVisitFacade.insertOperation(patMedOperation); } log.info("-----patMedOperationç主é®id为ï¼{}", patMedOperation.getId()); @@ -1522,7 +1532,7 @@ }).collect(Collectors.toList()) : null; if(ObjectUtils.isNotEmpty(patMedOperation.getId())){ patMedOperationItemMapper.deleteHardPatMedOperationItemByOpId(patMedOperation.getId().toString()); otherVisitFacade.deleteHardOperationItemByOpId(patMedOperation.getId().toString()); } //addMianTableFalgæ¯å¦éè¦å°ä¸»ææ¯çä¿¡æ¯æ¾å°PatMedOperation表ä¸ï¼åªæ第ä¸ä¸ªä¸»ææ¯ä¿¡æ¯éè¦æ¾ï¼åé¢çé½ä¸éè¦æ¾äºï¼ä¹å°±æ¯è¯´ï¼ç¬¬ä¸ä¸ªæ¾å®åï¼å°±è¦æè¿ä¸ªflagæ¹æfalseï¼ @@ -1554,12 +1564,12 @@ } patMedOperation.setUpdateTime(new Date()); patMedOperationMapper.updatePatMedOperation(patMedOperation); otherVisitFacade.updateOperation(patMedOperation); addMianTableFalg = false; } patMedOperationItem.setCreateTime(new Date()); patMedOperationItem.setUpdateTime(new Date()); patMedOperationItemMapper.insertPatMedOperationItem(patMedOperationItem); otherVisitFacade.insertOperationItem(patMedOperationItem); } } return true; @@ -1583,7 +1593,7 @@ patMedOperation.setOrgid(patArchive.getOrgid()); patMedOperation.setOpreqcode(externalOperationInfo.getShenQingDID()); //æ¥è¯¢ä¸ä¸ï¼è¯¥æ£è æ¯å¦å·²ç»æè¿äºæ°æ® List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation); List<PatMedOperation> patMedOperations = otherVisitFacade.selectOperationList(patMedOperation); if (CollectionUtils.isNotEmpty(patMedOperations)) { for(PatMedOperation operation : patMedOperations){ Long id = operation.getId(); @@ -1598,7 +1608,7 @@ //è·åéè¦åºé¢ææ¯é访ï¼æªå¤ççæ°æ® pmoi.setOpid(operation.getId().toString()); List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemList(pmoi); = otherVisitFacade.selectOperationItemListByCondition(pmoi); List<Long> operationItemIds = patMedOperationItems.stream() .map(PatMedOperationItem::getId) .filter(Objects::nonNull) @@ -1632,8 +1642,8 @@ } } operation.setUpdateTime(new Date()); patMedOperationMapper.updatePatMedOperation(operation); patMedOperationItemMapper.deleteSoftPatMedOperationItemByOpId(operation.getOpid()); otherVisitFacade.updateOperation(operation); otherVisitFacade.deleteSoftOperationItemByOpId(operation.getOpid()); } } } @@ -1752,7 +1762,7 @@ //å»é¢é£è¾¹è¯´è¦ç¨ç æ¡å·ï¼ä¸è¦ç¨ä½é¢å· patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); patMedInhosp.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC()); patMedInhosp.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID()); patMedInhosp.setStarttime(externalInHospPatientInfo.getRuYuanSJ()); @@ -1803,10 +1813,10 @@ int i = 1; if (CollectionUtils.isNotEmpty(patMedInhospList)) { patMedInhosp.setInhospid(patMedInhospList.get(0).getInhospid()); i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp); i = inhospVisitFacade.updatePatMedInhosp(patMedInhosp); } else { patMedInhosp.setCreateTime(new Date()); i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp); i = inhospVisitFacade.insertPatMedInhosp(patMedInhosp); } if (i == 1) return true; return false; smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
@@ -15,7 +15,12 @@ import com.ruoyi.common.utils.http.HttpUtils; import com.smartor.common.DistinctByProperty; import com.smartor.domain.*; import com.ruoyi.outpatientvisit.domain.PatMedOuthospError; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.inhospvisit.api.InhospVisitFacade; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.smartor.mapper.*; import com.ruoyi.outpatientvisit.mapper.PatMedOuthospErrorMapper; import com.smartor.service.IPatArchiveService; import com.smartor.service.IPatMedInhospService; import com.smartor.service.IPatMedOuthospService; @@ -91,7 +96,7 @@ @Autowired private ServiceSubtaskMapper serviceSubtaskMapper; @Autowired private PatMedInhospMapper patMedInhospMapper; private InhospVisitFacade inhospVisitFacade; @Autowired private PatMedOuthospErrorMapper patMedOuthospErrorMapper; @@ -918,7 +923,7 @@ if (pmIn.getStarttime() != null) { Date dayStart = DateUtils.truncate(pmIn.getStarttime(), Calendar.DAY_OF_MONTH); Date dayEnd = DateUtils.addDays(dayStart, 1); List<PatMedInhosp> outInhosps = patMedInhospMapper.selectOutInhospByPatnoAndOutDate( List<PatMedInhosp> outInhosps = inhospVisitFacade.selectOutInhospByPatnoAndOutDate( StringUtils.trim(pmIn.getPatno()), dayStart, dayEnd); if (CollectionUtils.isNotEmpty(outInhosps)) { //åå¨åºé¢è®°å½ï¼è¯´æ该æ£è æ¯åå ¥é¢ï¼æä¸ä¸æ¬¡åºé¢äº§ççåä»»å¡æ¹æä¸æ§è¡ smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -29,6 +29,27 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.ruoyi.template.domain.HeLibrary; import com.ruoyi.template.domain.IvrLibaScriptAssort; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq; import com.ruoyi.inhospvisit.api.InhospVisitFacade; import com.ruoyi.outpatientvisit.api.OuthospDataFacade; import com.ruoyi.template.domain.IvrTaskTemplate; import com.ruoyi.template.domain.IvrTaskTemplateScriptVO; import com.ruoyi.template.domain.IvrTaskTemplateTargetoption; import com.ruoyi.template.service.IIvrTaskTemplateService; import com.ruoyi.template.domain.IvrLibaTemplateScript; import com.ruoyi.template.mapper.IvrLibaScriptAssortMapper; import com.ruoyi.template.service.IIvrLibaTemplateScriptService; import com.ruoyi.template.domain.SvyLibScriptCategory; import com.ruoyi.template.domain.SvyLibTemplateScript; import com.ruoyi.template.domain.SvyTaskTemplate; import com.ruoyi.template.domain.SvyTaskTemplateScriptVO; import com.ruoyi.template.domain.SvyTaskTemplateTargetoption; import com.ruoyi.template.mapper.SvyLibScriptCategoryMapper; import com.ruoyi.template.service.ISvyTaskTemplateService; /** * ä»»å¡é®å·é®é¢é项Serviceä¸å¡å±å¤ç * @@ -40,6 +61,18 @@ public class ServiceSubtaskAnswerServiceImpl implements IServiceSubtaskAnswerService { @Autowired private ServiceSubtaskAnswerMapper serviceSubtaskAnswerMapper; /** * 跨模å访é®ä¸å¾ç»æ¨¡åé¨é¢ï¼ç¦æ¢ç´è¿å·²æ¬èµ°ç Mapperï¼ã */ @Autowired private OuthospDataFacade outhospDataFacade; /** * 跨模å访é®ä¸å¾ç»æ¨¡åé¨é¢ï¼ç¦æ¢ç´è¿å·²æ¬èµ°ç Mapperï¼ã */ @Autowired private InhospVisitFacade inhospVisitFacade; @Autowired private ServiceSubtaskMapper serviceSubtaskMapper; @@ -66,11 +99,7 @@ private PatArchiveMapper patArchiveMapper; @Autowired private PatMedInhospMapper patMedInhospMapper; @Autowired private PatMedOuthospMapper patMedOuthospMapper; @Autowired private IServiceSubtaskDetailTraceService traceService; @@ -81,8 +110,6 @@ @Autowired private ISvyLibTemplateScriptService svyLibTemplateScriptService; @Autowired private ISvyTaskTemplateTargetoptionService svyTaskTemplateTargetoptionService; @Autowired private IIvrTaskTemplateService ivrTaskTemplateService; @@ -613,13 +640,13 @@ //ä½é¢ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setSerialnum(serviceSubTaskMYDAnswerReq.getSerialnum()); patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); if (CollectionUtils.isNotEmpty(patMedInhospList)) patid = patMedInhospList.get(0).getPatid(); } else if (serviceSubTaskMYDAnswerReq.getMzzy().equals("2")) { //é¨è¯ PatMedOuthospQueryReq patMedOuthosp = new PatMedOuthospQueryReq(); patMedOuthosp.setSerialnum(serviceSubTaskMYDAnswerReq.getSerialnum()); patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(patMedOuthosp); patMedOuthosps = outhospDataFacade.callSpQueryOuthosp(patMedOuthosp); if (CollectionUtils.isNotEmpty(patMedOuthosps)) patid = patMedOuthosps.get(0).getPatid(); } else if (serviceSubTaskMYDAnswerReq.getMzzy().equals("3")) { //æå®ä¸ä¸ªé¨é¨ï¼ç¨æ¥å¤çæè¯å»ºè®® smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailTraceServiceImpl.java
@@ -13,8 +13,6 @@ import com.smartor.domain.VO.ServiceSubtaskDetailTraceVO; import com.smartor.mapper.ServiceSubtaskDetailMapper; import com.smartor.mapper.ServiceSubtaskDetailTraceMapper; import com.smartor.mapper.SvyLibScriptCategoryMapper; import com.smartor.mapper.SvyLibTemplateScriptMapper; import com.smartor.service.*; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -34,20 +32,12 @@ @Autowired private ServiceSubtaskDetailMapper serviceSubtaskDetailMapper; @Autowired private ISvyLibScriptCategoryService iSvyLibScriptCategoryService; @Autowired private SvyLibScriptCategoryMapper svyLibScriptCategoryMapper; @Autowired private ISvyLibTemplateScriptService isvyLibTemplateScriptService; @Autowired private IIvrLibaScriptAssortService iIvrLibaScriptAssortService; @Autowired private IIvrLibaTemplateScriptService iIvrLibaTemplateScriptService; /** * æ¥è¯¢é访任å¡å¼å¸¸è®°å½è·è¸ª smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -25,7 +25,7 @@ import com.ruoyi.system.service.ISysConfigService; import com.smartor.common.FtpService; import com.smartor.common.ScheduleSubtaskBuilder; import com.smartor.config.PhoneUtils; import com.ruoyi.common.utils.PhoneUtils; import com.smartor.domain.DTO.*; import com.smartor.domain.*; import com.smartor.domain.VO.*; @@ -62,6 +62,35 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import com.ruoyi.template.domain.VO.HeLibraryCountVO; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.ruoyi.othervisit.domain.PatMedOperationItem; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq; import com.ruoyi.inhospvisit.api.InhospVisitFacade; import com.ruoyi.outpatientvisit.api.OuthospDataFacade; import com.ruoyi.othervisit.api.OtherVisitFacade; import com.ruoyi.template.domain.IvrTaskTemplate; import com.ruoyi.template.domain.IvrTaskTemplateScript; import com.ruoyi.template.domain.IvrTaskTemplateScriptVO; import com.ruoyi.template.domain.IvrTaskTemplateTargetoption; import com.ruoyi.template.domain.IvrTaskTemplateVO; import com.smartor.domain.IvrTaskVisitResult; import com.ruoyi.template.mapper.IvrTaskTemplateTargetoptionMapper; import com.smartor.mapper.IvrTaskVisitResultMapper; import com.ruoyi.template.service.IIvrTaskTemplateScriptService; import com.ruoyi.template.service.IIvrTaskTemplateService; import com.ruoyi.template.service.IIvrTaskTemplateTargetoptionService; import com.ruoyi.template.domain.IvrLibaExtemplatescript; import com.ruoyi.template.mapper.IvrLibaExtemplatescriptMapper; import com.ruoyi.template.domain.SvyLibScriptCategory; import com.ruoyi.template.domain.SvyTaskTemplate; import com.ruoyi.template.domain.SvyTaskTemplateScript; import com.ruoyi.template.domain.SvyTaskTemplateScriptVO; import com.ruoyi.template.domain.SvyTaskTemplateTargetoption; import com.ruoyi.template.mapper.SvyLibScriptCategoryMapper; import com.ruoyi.template.service.ISvyTaskTemplateScriptService; import com.ruoyi.template.service.ISvyTaskTemplateService; import static cn.hutool.core.convert.Convert.toHex; /** @@ -82,6 +111,24 @@ */ @Autowired private SatisfactionFacade satisfactionFacade; /** * 跨模å访é®ä¸å¾ç»æ¨¡åé¨é¢ï¼ç¦æ¢ç´è¿å·²æ¬èµ°ç Mapperï¼ã */ @Autowired private OtherVisitFacade otherVisitFacade; /** * 跨模å访é®ä¸å¾ç»æ¨¡åé¨é¢ï¼ç¦æ¢ç´è¿å·²æ¬èµ°ç Mapperï¼ã */ @Autowired private OuthospDataFacade outhospDataFacade; /** * 跨模å访é®ä¸å¾ç»æ¨¡åé¨é¢ï¼ç¦æ¢ç´è¿å·²æ¬èµ°ç Mapperï¼ã */ @Autowired private InhospVisitFacade inhospVisitFacade; @Autowired private ServiceSubtaskMapper serviceSubtaskMapper; @@ -151,11 +198,7 @@ @Autowired private FtpService ftpService; @Autowired private PatMedInhospMapper patMedInhospMapper; @Autowired private PatMedOuthospMapper patMedOuthospMapper; @Autowired private PatArchiveMapper patArchiveMapper; @@ -228,8 +271,6 @@ private ServiceOutPathMapper serviceOutPathMapper; private static final String KEY_SEP = "\u0001"; @Autowired private PatMedOperationItemMapper patMedOperationItemMapper; /** * æ¥è¯¢åä¸ä»»å¡ï¼éè®¿ï¼ @@ -452,7 +493,7 @@ serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0]); } } PatMedInhosp inhosp = patMedInhospMapper.selectPatMedInhospByInhospid(serviceSubtask.getInhospid()); PatMedInhosp inhosp = inhospVisitFacade.selectPatMedInhospByInhospid(serviceSubtask.getInhospid()); if (ObjectUtils.isNotEmpty(inhosp)) { PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(inhosp.getPatid()); if (ObjectUtils.isNotEmpty(patArchive)) { @@ -513,7 +554,7 @@ patMedInhosp.setDeptcheckFlag("0"); patMedInhosp.setWardcheckFlag("0"); patMedInhosp.setDiagcheckFlag("0"); return patMedInhospMapper.updatePatMedInhosp(patMedInhosp); return inhospVisitFacade.updatePatMedInhosp(patMedInhosp); } public Map<String, String> calculateAge(LocalDate birthdate, LocalDate today) { @@ -737,7 +778,7 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospMydFlag("1"); patMedInhosp.setInhospid(inhospid); patMedInhospMapper.updatePatMedInhosp(patMedInhosp); inhospVisitFacade.updatePatMedInhosp(patMedInhosp); } } format = getOutPath(serviceSubtask, rsaPublicKeyExample); @@ -785,7 +826,7 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setPatid(serviceSubtask1.getPatid()); patMedInhosp.setInhospstate("0"); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp); PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask1.getPatid()); //æ¯å® æ°å¢å次é访ä¸è½è§¦åæ£è åå ¥é¢ boolean inhospAgain = true; @@ -1232,13 +1273,13 @@ patMedInhosp.setWardcheckFlag("0"); patMedInhosp.setDiagcheckFlag("0"); patMedInhosp.setInhospid(serviceSubtask.getInhospid()); patMedInhospMapper.updatePatMedInhosp(patMedInhosp); inhospVisitFacade.updatePatMedInhosp(patMedInhosp); } } else if (serviceSubtask.getServiceType().equals("3")) { if (serviceSubtask.getInhospid() != null) { PatMedOuthospQueryReq req = new PatMedOuthospQueryReq(); req.setOuthospno(serviceSubtask.getHospno()); List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(req); List<PatMedOuthosp> patMedOuthosps = outhospDataFacade.callSpQueryOuthosp(req); if (CollectionUtils.isNotEmpty(patMedOuthosps)) { PatMedOuthosp patMedOuthosp = patMedOuthosps.get(0); patMedOuthosp.setServerState("0"); @@ -1253,7 +1294,7 @@ PatMedOperationItem patMedOperationItem = new PatMedOperationItem(); patMedOperationItem.setOpercheckFlag("0"); patMedOperationItem.setId(serviceSubtask.getOperationItemId()); patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem); otherVisitFacade.updateOperationItem(patMedOperationItem); } } } @@ -2890,7 +2931,7 @@ } req.setDeptcode(deptcodes); req.setOrgid(request.getOrgid()); Long count = patMedOuthospMapper.callSpQueryOuthospCount(req); Long count = outhospDataFacade.callSpQueryOuthospCount(req); serviceStatisticsResponse.setPmoCount(count); } @@ -5461,7 +5502,7 @@ * @return */ @Override public Integer matchOptionIndex(String url, String questionText, String voiceText, List<IvrTaskTemplateTargetoption> options, String uuid) { public <T> Integer matchOptionIndex(String url, String questionText, String voiceText, List<T> options, String uuid) { JSONObject jsonObject = new JSONObject(); jsonObject.put("userQuestion", questionText); jsonObject.put("userAnswer", voiceText); smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.service.TemplateModuleDisabledException; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DtoConversionUtils; @@ -20,6 +21,28 @@ import com.smartor.service.IServiceTaskService; import org.springframework.transaction.annotation.Transactional; import com.ruoyi.template.domain.HeLibrary; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.ruoyi.inhospvisit.domain.PatMedInhospVO; import com.ruoyi.outpatientvisit.domain.PatMedOuthosp; import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq; import com.ruoyi.inhospvisit.api.InhospVisitFacade; import com.ruoyi.outpatientvisit.api.OuthospDataFacade; import com.ruoyi.template.domain.IvrTaskTemplateScript; import com.ruoyi.template.domain.IvrTaskTemplateScriptVO; import com.ruoyi.template.domain.IvrTaskTemplateTargetoption; import com.ruoyi.template.mapper.IvrTaskTemplateScriptMapper; import com.ruoyi.template.mapper.IvrTaskTemplateTargetoptionMapper; import com.ruoyi.template.domain.SvyLibTemplateScript; import com.ruoyi.template.domain.SvyLibTemplateTargetoption; import com.ruoyi.template.domain.SvyTaskTemplateScript; import com.ruoyi.template.domain.SvyTaskTemplateScriptVO; import com.ruoyi.template.domain.SvyTaskTemplateTargetoption; import com.ruoyi.template.mapper.SvyLibTemplateScriptMapper; import com.ruoyi.template.mapper.SvyLibTemplateTargetoptionMapper; import com.ruoyi.template.mapper.SvyTaskTemplateScriptMapper; import com.ruoyi.template.mapper.SvyTaskTemplateTargetoptionMapper; import com.ruoyi.template.api.TemplateFacade; /** * è¯é³ä»»å¡Serviceä¸å¡å±å¤ç * @@ -31,6 +54,24 @@ public class ServiceTaskServiceImpl implements IServiceTaskService { @Autowired private ServiceTaskMapper serviceTaskMapper; /** * 模æ¿æ°æ®ä¸å¾ç» ruoyi-template çé¨é¢åç¨ï¼è·¨æ¨¡åæ°æ®è®¿é®ååï¼ã */ @Autowired private TemplateFacade templateFacade; /** * 跨模å访é®ä¸å¾ç»æ¨¡åé¨é¢ï¼ç¦æ¢ç´è¿å·²æ¬èµ°ç Mapperï¼ã */ @Autowired private OuthospDataFacade outhospDataFacade; /** * 跨模å访é®ä¸å¾ç»æ¨¡åé¨é¢ï¼ç¦æ¢ç´è¿å·²æ¬èµ°ç Mapperï¼ã */ @Autowired private InhospVisitFacade inhospVisitFacade; @Autowired private ServiceSubtaskMapper serviceSubtaskMapper; @Autowired @@ -40,8 +81,6 @@ @Autowired private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper; @Autowired private HeLibraryMapper heLibraryMapper; @Autowired private SvyTaskTemplateScriptMapper svyTaskTemplateScriptMapper; @Autowired private IvrTaskTemplateScriptMapper ivrTaskTemplateScriptMapper; @@ -49,10 +88,6 @@ private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper; @Autowired private PatArchiveMapper patArchiveMapper; @Autowired private PatMedInhospMapper patMedInhospMapper; @Autowired private PatMedOuthospMapper patMedOuthospMapper; @Autowired private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper; @Autowired @@ -303,14 +338,14 @@ if (StringUtils.isNotEmpty(zyserialnum)) { PatMedInhospVO patMedInhospVO = new PatMedInhospVO(); patMedInhospVO.setSerialnum(zyserialnum); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospListByCondition(patMedInhospVO); List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospListByCondition(patMedInhospVO); if (CollectionUtils.isNotEmpty(patMedInhospList)) { patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhospList.get(0).getPatid()); } } else if (StringUtils.isNotEmpty(mzserialnum)) { PatMedOuthospQueryReq patMedOuthosp = new PatMedOuthospQueryReq(); patMedOuthosp.setSerialnum(mzserialnum); List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(patMedOuthosp); List<PatMedOuthosp> patMedOuthosps = outhospDataFacade.callSpQueryOuthosp(patMedOuthosp); if (CollectionUtils.isNotEmpty(patMedOuthosps)) { patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosps.get(0).getPatid()); } @@ -619,7 +654,18 @@ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask); } } HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId)); HeLibrary heLibrary; try { heLibrary = templateFacade.findHeLibraryById(Long.valueOf(templateId)); } catch (TemplateModuleDisabledException e) { // 模æ¿æ¨¡åè¢«å ³éï¼sys_config: template.enabled=falseï¼ï¼ // è¿éé级为空å表ï¼è**ä¸æ¯**让å¼å¸¸ååºå» ââ // æ£è æå¼ç宣æ页é¢ç §å¸¸å¯çãå¯æ交ï¼"åªè¦æå¼äºé¡µé¢å°±ç®æå"çåç»ç¶ææ´æ°ç §æ§æ§è¡ï¼ã // åå®ç°å¨æ¨¡æ¿æ¥ä¸å°æ¶è¿åçä¹æ¯ [null]ï¼å端æ¬å°±è½å®¹éï¼ç©ºå表æ´å¹²åã log.warn("ã模æ¿ã宣æä»»å¡å模æ¿è¢«æï¼æ¨¡åå·²å ³éï¼ï¼taskid={}, templateId={}ï¼æ¬æ¬¡è¿å空å 容", taskid, templateId); return new ArrayList(); } List list = new ArrayList(); list.add(heLibrary); return list; smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyFinishServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyFinishoptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyFinishtopicServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibExceptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibResultServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibScriptOptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibScriptTagServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateScriptServiceImpl.java
@@ -3,9 +3,9 @@ import com.ruoyi.common.utils.DateUtils; import com.smartor.domain.*; import com.smartor.mapper.ServiceSubtaskMapper; import com.smartor.mapper.SvyLibTemplateScriptMapper; import com.ruoyi.template.mapper.SvyLibTemplateScriptMapper; import com.smartor.service.ISvyLibTemplateScriptService; import com.smartor.service.ISvyLibTemplateTargetoptionService; import com.ruoyi.template.service.ISvyLibTemplateTargetoptionService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,6 +17,8 @@ import java.util.List; import java.util.Map; import com.ruoyi.template.domain.SvyLibTemplateScript; import com.ruoyi.template.domain.SvyLibTemplateTargetoption; import static net.sf.jsqlparser.parser.feature.Feature.values; /** smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateScriptWjxServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateTagServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateTargetoptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateTargetoptionWjxServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateWjxServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyLibTopicdirectionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyTaskScriptServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyTaskScriptoptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java
@@ -18,6 +18,15 @@ import java.util.List; import java.util.Map; import com.ruoyi.template.domain.SvyLibTemplateScript; import com.ruoyi.template.domain.SvyLibTemplateScriptVO; import com.ruoyi.template.domain.SvyLibTemplateTargetoption; import com.smartor.domain.SvyTask; import com.smartor.domain.SvyTaskSingle; import com.ruoyi.template.mapper.SvyLibTemplateScriptMapper; import com.ruoyi.template.mapper.SvyLibTemplateTargetoptionMapper; import com.smartor.mapper.SvyTaskMapper; import com.smartor.mapper.SvyTaskSingleMapper; /** * 综åé®å·ä»»å¡ï¼ä»»å¡ï¼Serviceä¸å¡å±å¤ç * smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateScriptServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateTargetoptionServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/SvyTopicServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/TemplateDeptServiceImpl.java
ÎļþÒÑɾ³ý smartor/src/main/java/com/smartor/service/impl/XHGatherPatArchiveServiceImpl.java
@@ -18,6 +18,7 @@ import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; import com.smartor.domain.*; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.smartor.mapper.*; import com.smartor.service.*; import lombok.extern.slf4j.Slf4j; smartor/src/main/java/com/smartor/statemachine/InhospStateMachine.java
@@ -3,7 +3,7 @@ import com.ruoyi.common.utils.StringUtils; import com.smartor.common.enums.InhospStateEnum; import com.smartor.common.exception.StateTransitionException; import com.smartor.domain.PatMedInhosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.smartor.service.IPatMedInhospService; import com.smartor.statemachine.handler.InhospStateHandler; import lombok.extern.slf4j.Slf4j; smartor/src/main/java/com/smartor/statemachine/InhospStateMachineService.java
@@ -1,6 +1,6 @@ package com.smartor.statemachine; import com.smartor.domain.PatMedInhosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; smartor/src/main/java/com/smartor/statemachine/handler/InhospStateHandler.java
@@ -1,6 +1,6 @@ package com.smartor.statemachine.handler; import com.smartor.domain.PatMedInhosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; /** * ä½é¢ç¶æå¤çå¨æ¥å£ smartor/src/main/java/com/smartor/statemachine/handler/impl/DischargeHandler.java
@@ -1,7 +1,7 @@ package com.smartor.statemachine.handler.impl; import com.ruoyi.common.utils.StringUtils; import com.smartor.domain.PatMedInhosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.smartor.service.IPatMedInhospService; import com.smartor.statemachine.handler.InhospStateHandler; import lombok.extern.slf4j.Slf4j; smartor/src/main/java/com/smartor/statemachine/handler/impl/InHospitalHandler.java
@@ -1,7 +1,7 @@ package com.smartor.statemachine.handler.impl; import com.ruoyi.common.utils.StringUtils; import com.smartor.domain.PatMedInhosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.smartor.service.IPatMedInhospService; import com.smartor.statemachine.handler.InhospStateHandler; import lombok.extern.slf4j.Slf4j; smartor/src/main/java/com/smartor/statemachine/handler/impl/PreAdmissionHandler.java
@@ -1,7 +1,7 @@ package com.smartor.statemachine.handler.impl; import com.ruoyi.common.utils.StringUtils; import com.smartor.domain.PatMedInhosp; import com.ruoyi.inhospvisit.domain.PatMedInhosp; import com.smartor.service.IPatMedInhospService; import com.smartor.statemachine.handler.InhospStateHandler; import lombok.extern.slf4j.Slf4j; smartor/src/main/resources/mapper/smartor/BaseDictOperationMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
@@ -147,7 +147,7 @@ <result property="filterDrcode" column="filter_drcode"/> </resultMap> <resultMap type="com.smartor.domain.PatMedInhosp" id="PatMedInhospResult"> <resultMap type="com.ruoyi.inhospvisit.domain.PatMedInhosp" id="PatMedInhospResult"> <result property="inhospid" column="inhospid"/> <result property="inhospno" column="inhospno"/> <result property="serialnum" column="serialnum"/> @@ -215,7 +215,7 @@ <result property="fuspecialadvice" column="fuspecialadvice"/> </resultMap> <resultMap type="com.smartor.domain.PatMedOuthosp" id="PatMedOuthospResult"> <resultMap type="com.ruoyi.outpatientvisit.domain.PatMedOuthosp" id="PatMedOuthospResult"> <result property="id" column="id"/> <result property="serialnum" column="serialnum"/> <result property="patid" column="patid"/> @@ -418,7 +418,7 @@ </select> <select id="selectPatMedInhospListCount" parameterType="com.smartor.domain.PatMedInhosp" resultType="Long"> <select id="selectPatMedInhospListCount" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultType="Long"> select count(*) FROM cryxx </select> @@ -442,13 +442,13 @@ WHERE row_num > #{lastRowNumber} LIMIT #{ps} </select> <select id="selectPatArchiveCount" parameterType="com.smartor.domain.PatMedInhosp" resultType="Long"> <select id="selectPatArchiveCount" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultType="Long"> select count(*) FROM hzjbxx </select> <select id="selectPatMedInhospList" parameterType="com.smartor.domain.PatMedInhosp" resultMap="PatMedInhospResult"> <select id="selectPatMedInhospList" parameterType="com.ruoyi.inhospvisit.domain.PatMedInhosp" resultMap="PatMedInhospResult"> select b.nurse_id, b.nurse_name, @@ -519,7 +519,7 @@ </select> <select id="selectPatMedOuthospList" parameterType="com.smartor.domain.PatMedOuthosp" <select id="selectPatMedOuthospList" parameterType="com.ruoyi.outpatientvisit.domain.PatMedOuthosp" resultMap="PatMedOuthospResult"> select outhospno, smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaExtemplatescriptMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTagMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/IvrTaskTemplateTargetoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/PatMedOuthospErrorMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/PatMedOuthospProvisionalMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SchemeLocallibraryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -2362,7 +2362,7 @@ month, st.service_type, st.id; </select> <select id="getDeptRanking" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes"> <select id="getDeptRanking" parameterType="com.ruoyi.common.core.service.dto.PatMedReq" resultType="com.ruoyi.common.core.service.dto.PatMedRes"> SELECT deptname, count(1) AS rc FROM service_subtask @@ -2756,8 +2756,8 @@ </if> </select> <select id="selectVisitCount" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes"> <select id="selectVisitCount" parameterType="com.ruoyi.common.core.service.dto.PatMedReq" resultType="com.ruoyi.common.core.service.dto.PatMedRes"> select 0 AS rc, count(1) AS rs @@ -2887,7 +2887,7 @@ </select> <!-- 宣æç»è®¡ï¼æç åºæç§å®¤åç»ï¼ç»è®¡åéæ»éãåéæåéï¼sendstate=6ï¼ã已读éï¼finishtimeä¸ä¸ºç©ºï¼ --> <select id="getHeLibraryCount" parameterType="com.smartor.domain.VO.HeLibraryCountVO" resultType="map"> <select id="getHeLibraryCount" parameterType="com.ruoyi.template.domain.VO.HeLibraryCountVO" resultType="map"> SELECT <choose> <when test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0"> @@ -2963,7 +2963,7 @@ order by schedule_seq asc, id asc </select> <select id="gethelibraryCountHyperlink" parameterType="com.smartor.domain.VO.HeLibraryCountVO" <select id="gethelibraryCountHyperlink" parameterType="com.ruoyi.template.domain.VO.HeLibraryCountVO" resultMap="ServiceSubtaskResult"> select id, visit_count, smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyFinishMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyFinishoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyFinishtopicMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibExceptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibResultMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTemplageCategoryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptWjxMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionWjxMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTemplateWjxMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyLibTopicdirectionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyTaskScriptMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyTaskScriptoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyTopicMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/SvyTopicoptionMapper.xml
ÎļþÒÑɾ³ý smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml
ÎļþÒÑɾ³ý
