eitc-admin/src/main/java/com/eitc/web/controller/common/CaptchaController.java

@@ -1,5 +1,6 @@
 package com.eitc.web.controller.common;
 
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -52,7 +53,8 @@ public class CaptchaController
         {
             return ajax;
         }
-
+        int width = 200;
+        int height = 50;
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();
         String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
@@ -67,12 +69,39 @@ public class CaptchaController
             String capText = captchaProducerMath.createText();
             capStr = capText.substring(0, capText.lastIndexOf("@"));
             code = capText.substring(capText.lastIndexOf("@") + 1);
-            image = captchaProducerMath.createImage(capStr);
+//            image = captchaProducerMath.createImage(capStr);
+            image = new BufferedImage(150, 50, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g2d = image.createGraphics();
+            // 设置背景颜色
+            g2d.setColor(Color.WHITE);
+            g2d.fillRect(0, 0, width, height);
+
+            // 设置字体和颜色
+            Font font = new Font("Arial", Font.BOLD, 20);
+            g2d.setFont(font);
+            g2d.setColor(Color.BLACK);
+            g2d.drawString(capStr, 10, 30);
+
+            // 释放图形上下文使用的系统资源
+            g2d.dispose();
         }
         else if ("char".equals(captchaType))
         {
             capStr = code = captchaProducer.createText();
-            image = captchaProducer.createImage(capStr);
+            image = new BufferedImage(150, 50, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g2d = image.createGraphics();
+            // 设置背景颜色
+            g2d.setColor(Color.WHITE);
+            g2d.fillRect(0, 0, width, height);
+
+            // 设置字体和颜色
+            Font font = new Font("Arial", Font.BOLD, 20);
+            g2d.setFont(font);
+            g2d.setColor(Color.BLACK);
+            g2d.drawString(capStr, 10, 30);
+
+            // 释放图形上下文使用的系统资源
+            g2d.dispose();
         }
 
         redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);

eitc-admin/src/main/java/com/eitc/web/controller/saomiaoyi/SaoMiaoYiController.java

@@ -0,0 +1,113 @@
+package com.eitc.web.controller.saomiaoyi;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.eitc.common.annotation.IgnoreReturnResultEncryption;
+import com.eitc.common.config.EitcConfig;
+import com.eitc.common.core.domain.AjaxResult;
+import com.eitc.common.utils.InterfaceVerificationUtil;
+import com.eitc.common.utils.file.FileUploadUtils;
+import com.eitc.framework.config.ServerConfig;
+import com.eitc.patient.domain.ImageRecord;
+import com.eitc.patient.service.IImageRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * SaoMiaoYiController
+ *
+ * @author mtx
+ * @date: 2024/09/11 14:37
+ */
+@RestController
+@RequestMapping("/pc/api/scanner")
+public class SaoMiaoYiController {
+
+    @Resource
+    private RestTemplate restTemplate;
+    @Value("${Total.ip}")
+    private String fileUrl;
+    @Resource
+    private IImageRecordService imageRecordService;
+    @Resource
+    private ServerConfig serverConfig;
+
+    /**
+     * 慧视口腔-诊所列表
+     */
+    @GetMapping(value = "/clinicList")
+    @ApiOperation("慧视健康-诊所列表")
+    @IgnoreReturnResultEncryption
+    public AjaxResult clinicList() {
+        // 这个是为了防止恶意请求来做的参数增加
+        String saSignStr = InterfaceVerificationUtil.getSaSignStr(new HashMap<>());
+        String url = fileUrl + "api/sys/clinict/appGetClinictList?" + saSignStr;
+        String object = restTemplate.getForObject(url, String.class);
+        return JSONObject.parseObject(object, AjaxResult.class);
+    }
+
+
+    @PostMapping("/uploads")
+    @ApiOperation("上传影像")
+    @IgnoreReturnResultEncryption
+    public AjaxResult uploadFiles(String identificationCard, List<MultipartFile> files) {
+        if (StringUtils.isBlank(identificationCard)) {
+            return AjaxResult.warn("请输入身份证号");
+        }
+        try {
+            List<ImageRecord> list = new ArrayList<>();
+            // 上传文件路径
+            String filePath = EitcConfig.getUploadPath();
+            // 上传并返回新文件名称
+            for (MultipartFile file : files) {
+                // 上传并返回新文件名称
+                String fileName = FileUploadUtils.upload(filePath, file);
+                ImageRecord imageRecord = new ImageRecord();
+                imageRecord.setImageUrl(fileName);
+                String url = serverConfig.getUrl() + fileName;
+                imageRecord.setFullImageUrl(url);
+                imageRecord.setIdentificationCard(identificationCard);
+                list.add(imageRecord);
+            }
+            return toAjax(imageRecordService.saveBatch(list));
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    @GetMapping("/list")
+    @ApiOperation("查询影像")
+    @IgnoreReturnResultEncryption
+    public AjaxResult list(ImageRecord imageRecord) {
+        List<ImageRecord> list = imageRecordService.list(Wrappers.<ImageRecord>lambdaQuery()
+                .eq(StringUtils.isNotBlank(imageRecord.getIdentificationCard()), ImageRecord::getIdentificationCard, imageRecord.getIdentificationCard()));
+        return AjaxResult.success(list);
+    }
+
+    @DeleteMapping("/remove")
+    @ApiOperation("删除影像")
+    @IgnoreReturnResultEncryption
+    public AjaxResult remove(String ids) {
+        List<String> idList = Arrays.asList(ids.split(","));
+        return toAjax(imageRecordService.removeBatchByIds(idList));
+    }
+
+    private AjaxResult toAjax(boolean result) {
+        return result ? AjaxResult.success() : AjaxResult.error();
+    }
+
+}

eitc-admin/src/main/java/com/eitc/web/controller/system/SysConfigController.java

@@ -69,7 +69,7 @@ public class SysConfigController extends BaseController
     /**
      * 根据参数键名查询参数值
      */
-    @GetMapping(value = "/configKey/{configKey}")
+//    @GetMapping(value = "/configKey/{configKey}")
     public AjaxResult getConfigKey(@PathVariable String configKey)
     {
         return success(configService.selectConfigByKey(configKey));

eitc-admin/src/main/java/com/eitc/web/controller/system/SysLoginController.java

@@ -2,6 +2,8 @@ package com.eitc.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
+
+import com.eitc.common.utils.CryptoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,8 +46,10 @@ public class SysLoginController
     public AjaxResult login(@RequestBody LoginBody loginBody)
     {
         AjaxResult ajax = AjaxResult.success();
+        String encryptPassword = loginBody.getPassword();
+        String password = CryptoUtil.decrypt(encryptPassword);
         // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+        String token = loginService.login(loginBody.getUsername(), password, loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
         return ajax;

eitc-admin/src/main/java/com/eitc/web/controller/system/SysRoleController.java

@@ -59,9 +59,13 @@ public class SysRoleController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysRole role)
     {
-        startPage();
-        List<SysRole> list = roleService.selectRoleList(role);
-        return getDataTable(list);
+        try {
+            startPage();
+            List<SysRole> list = roleService.selectRoleList(role);
+            return getDataTable(list);
+        } catch (Exception e) {
+            throw new RuntimeException("查询失败");
+        }
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)

eitc-admin/src/main/java/com/eitc/web/controller/system/SysUserController.java

@@ -146,6 +146,8 @@ public class SysUserController extends BaseController
         }
         user.setCreateBy(getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setLoginIp(null);
+        user.setLoginDate(null);
         return toAjax(userService.insertUser(user));
     }
 
@@ -172,6 +174,8 @@ public class SysUserController extends BaseController
             return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(getUsername());
+        user.setLoginIp(null);
+        user.setLoginDate(null);
         return toAjax(userService.updateUser(user));
     }
 

eitc-admin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 8080
+    port: 8081
     servlet:
         # 应用的访问路径
         context-path: /api
@@ -41,8 +41,9 @@ spring:
             # 主库数据源
             master:
                 url: jdbc:mysql://39.105.121.97:13306/eitc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
-                username: root
-                password: Eitc@gnhz702
+                username: ENC(Y+enSi2hyVCiZUI6FwKzyptOL3Ekds9Q)
+#                Eitc@gnhz702
+                password: ENC(uPV/9/Fy5TFFE0m0GGchwPjT0/iulahbf/0Y46/whfE=)
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -116,14 +117,21 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
-
+jasypt:
+    encryptor:
+        # 密码盐值(自定义)
+        password: guoneng
+        # 加密算法设置
+        algorithm: PBEWithMD5AndDES
+        iv-generator-classname: org.jasypt.iv.RandomIvGenerator
+        salt-generator-classname: org.jasypt.salt.RandomSaltGenerator
 Total:
-    ip: http://localhost:8080/ # 主服务器的ip
-    ipport: http://127.0.0.1  # 本机ip
+    ip: http://39.105.121.97:8080/ # 主服务器的ip
+    ipport: http://39.105.121.97  # 本机ip 必须是映射ip 要不访问不到宿主机的脚本服务
 # Minio配置
 minio:
     #  url: http://39.105.121.97:19000
     accessKey: minioadmin
     secretKey: minioadmin
     bucketName: eitc
-    endpoint: http://192.168.3.17:19000
+    endpoint: http://39.105.121.97:19000

eitc-admin/src/main/resources/application-druid.yml

@@ -40,8 +40,8 @@ spring:
             # 主库数据源
             master:
                 url: jdbc:mysql://mysql:3306/eitc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
-                username: root
-                password: Eitc@gnhz702
+                username: ENC(Y+enSi2hyVCiZUI6FwKzyptOL3Ekds9Q)
+                password: ENC(uPV/9/Fy5TFFE0m0GGchwPjT0/iulahbf/0Y46/whfE=)
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -116,6 +116,15 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
 
+jasypt:
+    encryptor:
+        # 密码盐值(自定义)
+        password: guoneng
+        # 加密算法设置
+        algorithm: PBEWithMD5AndDES
+        iv-generator-classname: org.jasypt.iv.RandomIvGenerator
+        salt-generator-classname: org.jasypt.salt.RandomSaltGenerator
+
 Total:
     ip: http://39.105.121.97:8080/ # 主服务器的ip
     ipport: http://39.105.121.97  # 本机ip 必须是映射ip 要不访问不到宿主机的脚本服务

eitc-admin/src/main/resources/application-prod.yml

@@ -116,6 +116,15 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
 
+jasypt:
+    encryptor:
+        # 密码盐值(自定义)
+        password: guoneng
+        # 加密算法设置
+        algorithm: PBEWithMD5AndDES
+        iv-generator-classname: org.jasypt.iv.RandomIvGenerator
+        salt-generator-classname: org.jasypt.salt.RandomSaltGenerator
+
 Total:
     ip: http://39.105.121.97:8080/ # 主服务器的ip
     ipport: http://106.74.15.131  # 本机ip 必须是映射ip 要不访问不到宿主机的脚本服务

eitc-admin/src/main/resources/application.yml

@@ -82,3 +82,5 @@ sa-token:
     # API 接口签名秘钥 （随便乱摁几个字母即可）
     secret-key: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
 
+websocket:
+  port: 8002

eitc-admin/src/main/resources/templates/medical-record.html

@@ -135,25 +135,46 @@ lang=EN-US style='font-size:18.0pt;line-height:150%'>${companyName}</span></b></
 </table>
 <hr/>
 <table class=MsoTableGrid border=0 cellspacing=0 cellpadding=0 width=713 style='width:534.65pt;border-collapse:collapse;border:none'>
- <#if patient.listMap?? && (patient.listMap?size>0)>
- <#list patient.listMap?keys as key>
- <tr>
-  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>${key}：</span></p>
-  </td>
-  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal><span lang=EN-US>
-  <#assign list = patient.listMap[key]!>
-  <#if list?? && (list?size>0)>
-      <#list list as li>
-          <p><span>${li.toothPosition!} ${li.contentInfo!}</span></p>
-      </#list>
-  </#if>
-  </span></p>
-  </td>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>主诉：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.chiefComplaintContent!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>现病史：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.presentIllnessContent!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>既往史：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.pastHistory!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>家族史：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.familyHistory!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>过敏史：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.allergyHistory!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>检查：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.inspectContent!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>诊断：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.diagnosisContent!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>治疗计划：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.treatmentPlanningContent!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>处置：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.disposeContent!}</span></p></td>
+ </tr>
+ <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>便签：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.noteContent!}</span></p></td>
  </tr>
-</#list>
-</#if>
 </table>
 <div style="page-break-after: always;"></div>
 <p class=MsoNormal><span style='font-family:宋体'>医生声明：</span></p>

eitc-common/pom.xml

@@ -181,7 +181,29 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
 
+        <!-- 第三方拼音依赖包，配合 hutool-all 包中的 PinyinUtil 拼音工具使用 start -->
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.biezhi</groupId>
+            <artifactId>TinyPinyin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.stuxuhai</groupId>
+            <artifactId>jpinyin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
+        </dependency>
     </dependencies>
 
 </project>

eitc-common/src/main/java/com/eitc/common/annotation/IgnoreReturnResultEncryption.java

@@ -0,0 +1,21 @@
+package com.eitc.common.annotation;
+
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 忽略返回结果加密
+ *
+ * @author eitc
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Component
+public @interface IgnoreReturnResultEncryption {
+}

eitc-common/src/main/java/com/eitc/common/config/ParameterRequestWrapper.java

@@ -0,0 +1,118 @@
+package com.eitc.common.config;
+
+import org.springframework.util.StreamUtils;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+public class ParameterRequestWrapper  extends HttpServletRequestWrapper {
+    private Map<String , String[]> params = new HashMap<String, String[]>();
+    /**
+     * 缓存下来的HTTP body
+     */
+    private byte[] body;
+
+
+    @SuppressWarnings("unchecked")
+    public ParameterRequestWrapper(HttpServletRequest request) throws IOException {
+        // 将request交给父类，以便于调用对应方法的时候，将其输出，其实父亲类的实现方式和第一种new的方式类似
+        super(request);
+        //将参数表，赋予给当前的Map以便于持有request中的参数
+        this.params.putAll(request.getParameterMap());
+        //将参数表，赋予给当前的Map以便于持有request中的参数
+        this.body = StreamUtils.copyToByteArray(request.getInputStream());
+    }
+    //重载一个构造方法
+    public ParameterRequestWrapper(HttpServletRequest request , Map<String , Object> extendParams) throws IOException {
+        this(request);
+        addAllParameters(extendParams);//这里将扩展参数写入参数表
+    }
+
+
+    public void addAllParameters(Map<String , Object>otherParams) {//增加多个参数
+        for(Map.Entry<String , Object>entry : otherParams.entrySet()) {
+            addParameter(entry.getKey() , entry.getValue());
+        }
+    }
+
+
+    public void addParameter(String name , Object value) {//增加参数
+        if(value != null) {
+            if(value instanceof String[]) {
+                this.params.put(name , (String[])value);
+            }else if(value instanceof String) {
+                this.params.put(name , new String[] {(String)value});
+            }else {
+                this.params.put(name , new String[] {String.valueOf(value)});
+            }
+        }
+    }
+
+
+
+
+    /**
+     * 重新包装输入流
+     * @return
+     * @throws IOException
+     */
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        InputStream bodyStream = new ByteArrayInputStream(body);
+        return new ServletInputStream() {
+
+            @Override
+            public int read() throws IOException {
+                return bodyStream.read();
+            }
+
+            /**
+             * 下面的方法一般情况下不会被使用，如果你引入了一些需要使用ServletInputStream的外部组件，可以重点关注一下。
+             * @return
+             */
+            @Override
+            public boolean isFinished() {
+                return false;
+            }
+
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+
+            }
+        };
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+
+    public void setInputStream( byte[] in) {
+        this.body = in;
+    }
+
+
+}

eitc-common/src/main/java/com/eitc/common/constant/HttpConst.java

@@ -0,0 +1,23 @@
+package com.eitc.common.constant;
+
+public class HttpConst {
+    /**
+     * 几种常见的Content-Type
+     */
+    public static final String FORM_URLENCODED_CONTENT_TYPE ="application/x-www-form-urlencoded";
+
+    public static final String JSON_CONTENT_TYPE = "application/json";
+
+    public static final String MULTIPART_CONTENT_TYPE = "multipart/form-data";
+    /**
+     * 常见的post/get请求方式
+     */
+    public static final String POST_METHOD = "post";
+
+    public static final String GET_METHOD = "GET";
+
+    public static final String PUT_METHOD = "put";
+
+    public static final String OPTIONS_METHOD = "options";
+
+}

eitc-common/src/main/java/com/eitc/common/core/domain/AjaxResult.java

@@ -2,7 +2,10 @@ package com.eitc.common.core.domain;
 
 import java.util.HashMap;
 import java.util.Objects;
+
+import com.alibaba.fastjson2.JSON;
 import com.eitc.common.constant.HttpStatus;
+import com.eitc.common.utils.CryptoUtil;
 import com.eitc.common.utils.StringUtils;
 
 /**
@@ -55,7 +58,7 @@ public class AjaxResult extends HashMap<String, Object>
         super.put(MSG_TAG, msg);
         if (StringUtils.isNotNull(data))
         {
-            super.put(DATA_TAG, data);
+            super.put(DATA_TAG,  data);
         }
     }
 

eitc-common/src/main/java/com/eitc/common/filter/CustomResponseBodyAdviceAdapter.java

@@ -0,0 +1,54 @@
+package com.eitc.common.filter;
+
+import com.alibaba.fastjson2.JSON;
+import com.eitc.common.annotation.IgnoreReturnResultEncryption;
+import com.eitc.common.core.domain.AjaxResult;
+import com.eitc.common.core.page.TableDataInfo;
+import com.eitc.common.utils.CryptoUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+
+@ControllerAdvice
+@Slf4j
+public class CustomResponseBodyAdviceAdapter implements ResponseBodyAdvice<Object> {
+
+    @Override
+    public boolean supports(MethodParameter returnType, Class converterType) {
+        Method method = returnType.getMethod();
+        assert method != null;
+        IgnoreReturnResultEncryption ra = method.getAnnotation(IgnoreReturnResultEncryption.class);
+        return Objects.isNull(ra);
+    }
+
+    @Override
+    public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
+                                  Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
+        if (body instanceof AjaxResult) {
+            AjaxResult ajaxResult = (AjaxResult) body;
+            try {
+                return CryptoUtil.encrypt(JSON.toJSONString(ajaxResult));
+            } catch (Exception e) {
+                log.error("AjaxResult加密失败：" + body, e);
+                return ajaxResult;
+            }
+        } else if (body instanceof TableDataInfo) {
+            TableDataInfo tableDataInfo = (TableDataInfo) body;
+            try {
+                return CryptoUtil.encrypt(JSON.toJSONString(tableDataInfo));
+            } catch (Exception e) {
+                log.error("TableDataInfo加密失败：" + body, e);
+                return tableDataInfo;
+            }
+        }
+        return body;
+    }
+}

eitc-common/src/main/java/com/eitc/common/filter/RepeatableFilter.java

@@ -1,6 +1,14 @@
 package com.eitc.common.filter;
 
-import java.io.IOException;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.eitc.common.config.ParameterRequestWrapper;
+import com.eitc.common.constant.HttpConst;
+import com.eitc.common.utils.CryptoUtil;
+import com.eitc.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -8,45 +16,112 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-import org.springframework.http.MediaType;
-import com.eitc.common.utils.StringUtils;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.stream.Collectors;
+
 
 /**
  * Repeatable 过滤器
  *
  * @author eitc
  */
-public class RepeatableFilter implements Filter
-{
+@Slf4j
+public class RepeatableFilter implements Filter {
+
+    private static final String DECRYPT_PARAM_NAME = "decrypt";//请求参数包含的是否加密的字段
+
+    private static final String DEFAULT_DECRYPT_TYPE = "AES";//默认加密的类型
+
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException
-    {
+    public void init(FilterConfig filterConfig) throws ServletException {
 
     }
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException
-    {
-        ServletRequest requestWrapper = null;
-        if (request instanceof HttpServletRequest
-                && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE))
+            throws IOException, ServletException {
+        HttpServletRequest req = (HttpServletRequest) request;
+        HttpServletResponse res = (HttpServletResponse) response;
         {
-            requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
+            String contentType = req.getContentType();//获取contentType请求头
+            if (StringUtils.isNotBlank(contentType)) {
+                String method = req.getMethod();//获取请求方法  post/get
+                //2 处理post请求  只处理application/x-www-form-urlencoded  application/json,对于multipart/form-data，直接放行
+                if (method.trim().equalsIgnoreCase(HttpConst.POST_METHOD) || method.trim().equalsIgnoreCase(HttpConst.PUT_METHOD)) {
+                    if (contentType.trim().toLowerCase().contains(HttpConst.MULTIPART_CONTENT_TYPE)) {
+                        chain.doFilter(req, response);
+                        return;
+                    }
+                    //处理application/x-www-form-urlencoded
+                    if (contentType.trim().toLowerCase().contains(HttpConst.FORM_URLENCODED_CONTENT_TYPE)) {
+                        String decrypt = request.getParameter(DECRYPT_PARAM_NAME);
+                        if (decrypt == null || decrypt.trim().isEmpty()) {
+                            chain.doFilter(request, response);
+                            return;
+                        }
+                        chain.doFilter(req, response);
+                        return;
+                    }
+                    //处理application/json
+                    if (contentType.trim().toLowerCase().contains(HttpConst.JSON_CONTENT_TYPE)) {
+                        ParameterRequestWrapper requestWrapper = new ParameterRequestWrapper(req);
+                        try {
+                            String collect = requestWrapper.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
+                            // 解密
+                            String decrypt = CryptoUtil.decrypt(collect);
+                            String jsonString = null;
+                            try {
+                                JSONObject parseObject = JSONObject.parseObject(decrypt);
+                                jsonString = parseObject.toJSONString();
+                            } catch (Exception e) {
+                                JSONArray jsonArray = JSONArray.parseArray(decrypt);
+                                jsonString = jsonArray.toJSONString();
+                            }
+                            byte[] bytes = jsonString.getBytes(StandardCharsets.UTF_8);
+                            ByteArrayOutputStream binaryStream = new ByteArrayOutputStream();
+                            try {
+                                binaryStream.write(bytes);
+                                byte[] byteArray = binaryStream.toByteArray();
+                                requestWrapper.setInputStream(byteArray);
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            } finally {
+                                try {
+                                    binaryStream.close();
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        } catch (Exception e) {
+                            log.error("解密失败：" + req.getContextPath(), e);
+                        }
+                        chain.doFilter(requestWrapper, response);
+                        return;
+                    }
+                }
+            }
         }
-        if (null == requestWrapper)
-        {
-            chain.doFilter(request, response);
+
+
+        HttpServletRequest requestWrapper = null;
+        if (req instanceof HttpServletRequest
+                && StringUtils.startsWithIgnoreCase(req.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
+            requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
         }
-        else
-        {
-            chain.doFilter(requestWrapper, response);
+        if (null == requestWrapper) {
+            chain.doFilter(req, res);
+        } else {
+            chain.doFilter(requestWrapper, res);
         }
     }
 
     @Override
-    public void destroy()
-    {
+    public void destroy() {
 
     }
+
+
 }

eitc-common/src/main/java/com/eitc/common/utils/CryptoUtil.java

@@ -0,0 +1,113 @@
+package com.eitc.common.utils;
+
+import org.apache.commons.codec.binary.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+
+
+
+
+
+
+
+
+
+
+public class CryptoUtil {
+
+    private final static String IV = "1234567890123456";//需要前端与后端配置一致
+    private final static String KEY = "1234567890123456";
+
+    /***
+     * 加密
+     * @param  data 要加密的数据
+     * @return encrypt
+     */
+    public static String encrypt(String data){
+        return encrypt(data, KEY, IV);
+    }
+
+    public static Object decryptObject(Object obj) throws Exception{
+        return ObjectUtils.decryptObjectValues(obj);
+    }
+
+    /***
+     * param data 需要解密的数据
+     * 调用desEncrypt（）方法
+     */
+    public static String decrypt(String data){
+        return decrypt(data, KEY, IV);
+    }
+
+    /**
+     * 加密方法
+     * @param data  要加密的数据
+     * @param key 加密key
+     * @param iv 加密iv
+     * @return 加密的结果
+     */
+    private static String encrypt(String data, String key, String iv){
+        try {
+            //"算法/模式/补码方式"NoPadding PkcsPadding
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            int blockSize = cipher.getBlockSize();
+
+            byte[] dataBytes = data.getBytes();
+            int plaintextLength = dataBytes.length;
+            if (plaintextLength % blockSize != 0) {
+                plaintextLength = plaintextLength + (blockSize - (plaintextLength % blockSize));
+            }
+
+            byte[] plaintext = new byte[plaintextLength];
+            System.arraycopy(dataBytes, 0, plaintext, 0, dataBytes.length);
+
+            SecretKeySpec keyspec = new SecretKeySpec(key.getBytes(), "AES");
+            IvParameterSpec ivspec = new IvParameterSpec(iv.getBytes());
+
+            cipher.init(Cipher.ENCRYPT_MODE, keyspec, ivspec);
+            byte[] encrypted = cipher.doFinal(plaintext);
+
+            return Base64.encodeBase64String(encrypted);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 解密方法
+     * @param data 要解密的数据
+     * @param key  解密key
+     * @param iv 解密iv
+     * @return 解密的结果
+     */
+    private static String decrypt(String data, String key, String iv){
+        try {
+            if(StringUtils.isEmpty(data)) {
+                return "";
+            }
+            byte[] encrypted1 = new Base64().decode(data);
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), "AES");
+            IvParameterSpec ivSpec = new IvParameterSpec(iv.getBytes());
+            cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec);
+            byte[] original = cipher.doFinal(encrypted1);
+            return new String(original, StandardCharsets.UTF_8).trim();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "解析错误";
+        }
+    }
+
+    public static void main(String[] args) {
+        String a = encrypt("123456");
+        System.out.println(a);
+        String b = decrypt(a);
+        System.out.println(b);
+    }
+}

eitc-common/src/main/java/com/eitc/common/utils/JasyptUtils.java

@@ -0,0 +1,33 @@
+package com.eitc.common.utils;
+
+import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
+import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
+
+public class JasyptUtils {
+    public static void main(String[] args) {
+        PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
+        // set config
+        SimpleStringPBEConfig config = new SimpleStringPBEConfig();
+        //设置盐值
+        config.setPassword("guoneng");
+        //设置算法配置信息
+        config.setAlgorithm("PBEWithMD5AndDES");
+        config.setKeyObtentionIterations("1000");
+        config.setProviderName("SunJCE");
+        config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator");
+        config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
+        config.setStringOutputType("base64");
+        config.setPoolSize("1");
+        //注入配置
+        encryptor.setConfig(config);
+        //加密
+        System.out.println("-----------加密串");
+        String encryptUserName = encryptor.encrypt("Eitc@gnhz702");
+        System.out.println(encryptUserName);
+        //解密
+        System.out.println("-----------解密串");
+        String decrypted = encryptor.decrypt(encryptUserName);
+        System.out.println(decrypted);
+
+    }
+}

eitc-common/src/main/java/com/eitc/common/utils/ObjectUtils.java

@@ -0,0 +1,50 @@
+package com.eitc.common.utils;
+
+import com.eitc.common.utils.bean.BeanUtils;
+import lombok.extern.log4j.Log4j2;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+//import static sun.invoke.util.Wrapper.isPrimitiveType;
+
+
+
+
+
+
+
+
+
+@Log4j2
+public class ObjectUtils {
+    public static Object decryptObjectValues(Object obj) throws Exception{
+        if (obj == null) {
+            return null;
+        }
+        Class<?> objClass = obj.getClass();
+        PropertyDescriptor[] propertyDescriptors = BeanUtils.getPropertyDescriptors(objClass);
+        for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            Method readMethod = propertyDescriptor.getReadMethod();
+            Method writeMethod = propertyDescriptor.getWriteMethod();
+            if (readMethod != null && writeMethod!=null) {
+                try {
+                    Object value = readMethod.invoke(obj);
+                    if(value==null) {
+                        continue;
+                    }
+//                    if(isPrimitiveType(value.getClass()) && value instanceof String) {
+//                        String changeValue = CryptoUtil.decrypt((String)value);
+//                        writeMethod.invoke(obj, changeValue);
+//                    }
+                } catch (IllegalAccessException | InvocationTargetException e) {
+                    e.printStackTrace();
+                    log.error("反射获取类【" + objClass.getName() + "】方法异常，", e);
+                }
+            }
+        }
+        return obj;
+
+    }
+}

eitc-common/src/main/java/com/eitc/common/utils/PatientBaseUtil.java

@@ -1,11 +1,10 @@
 package com.eitc.common.utils;
 
+import cn.hutool.extra.pinyin.PinyinUtil;
 import com.eitc.common.core.redis.RedisCache;
 import com.eitc.common.utils.spring.SpringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -25,6 +24,7 @@ public class PatientBaseUtil {
 
     /**
      * 生成多少位位随机数
+     *
      * @param length 需要生成的位数
      * @return 返回结果
      * @author mtx
@@ -156,4 +156,27 @@ public class PatientBaseUtil {
         return start1.compareTo(end2) <= 0 && end1.compareTo(start2) >= 0;
     }
 
+    /**
+     * 获取字符串中每个汉字的拼音首字母
+     *
+     * @param content 输入的字符串，用于提取拼音首字母
+     * @return 返回提取后的拼音首字母字符串
+     */
+    public static String getPinYinFirstLetter(String content) {
+        // 调用PinyinUtil工具类的getFirstLetter方法，传入content和空字符串作为参数
+        // 空字符串表示如果content为空，则返回空字符串
+        return PinyinUtil.getFirstLetter(content, "");
+    }
+
+    /**
+     * 将汉字转换为拼音
+     *
+     * @param content 需要转换的汉字内容
+     * @return 转换后的拼音字符串
+     */
+    public static String getPinyin(String content) {
+        // 调用PinyinUtil工具类的getPinyin方法进行汉字到拼音的转换，若content中包含非汉字字符，则不处理，返回空字符串
+        return PinyinUtil.getPinyin(content, "");
+    }
+
 }

eitc-common/src/main/java/com/eitc/common/utils/file/FileUploadUtils.java

@@ -25,7 +25,7 @@ public class FileUploadUtils
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 150 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

eitc-common/src/main/java/com/eitc/common/utils/file/MimeTypeUtils.java

@@ -34,7 +34,7 @@ public class MimeTypeUtils
             // 压缩文件
             "rar", "zip", "gz", "bz2",
             // 视频格式
-            "mp4", "avi", "rmvb",
+            "mp4", "avi", "rmvb", "mov",
             // pdf
             "pdf" };
 

eitc-manage/src/main/java/com/eitc/manage/controller/helper/SysClinicInfoHelper.java

@@ -123,9 +123,13 @@ public class SysClinicInfoHelper {
     }
 
     public String getSysClinicInfoCode() {
-        List<SysClinicInfo> list = sysClinicInfoService.list(Wrappers.<SysClinicInfo>lambdaQuery().select(SysClinicInfo::getClinicCode));
-        List<String> collect = list.stream().map(SysClinicInfo::getClinicCode).collect(Collectors.toList());
-        String max = Collections.max(collect);
+        String max = "0";
+        try {
+            List<SysClinicInfo> list = sysClinicInfoService.list(Wrappers.<SysClinicInfo>lambdaQuery().select(SysClinicInfo::getClinicCode));
+            List<String> collect = list.stream().map(SysClinicInfo::getClinicCode).collect(Collectors.toList());
+            max = Collections.max(collect);
+        } catch (Exception e) {
+        }
         return String.format("%04d",Integer.parseInt(max)+1);
     }
 

eitc-patient-app/src/main/java/com/eitc/patient/controller/ApiAppController.java

@@ -7,6 +7,7 @@ import com.eitc.common.annotation.Log;
 import com.eitc.common.core.controller.BaseController;
 import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.enums.BusinessType;
+import com.eitc.common.utils.CryptoUtil;
 import com.eitc.common.utils.InterfaceVerificationUtil;
 import com.eitc.patient.domain.AppUser;
 import com.eitc.patient.domain.ProtocolTemplate;
@@ -30,6 +31,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * ApiController
@@ -72,17 +74,15 @@ public class ApiAppController extends BaseController {
 
     /**
      * 诊所列表
-     *
-     * @return
      */
     @GetMapping(value = "/clinicList")
     @ApiOperation("诊所列表")
-    public JSONObject clinicList() {
+    public AjaxResult clinicList() {
         // 这个是为了防止恶意请求来做的参数增加
         String saSignStr = InterfaceVerificationUtil.getSaSignStr(new HashMap<>());
         String url = fileUrl + "api/sys/clinict/appGetClinictList?" + saSignStr;
         String object = restTemplate.getForObject(url, String.class);
-        return JSONObject.parseObject(object);
+        return JSONObject.parseObject(CryptoUtil.decrypt(object), AjaxResult.class);
     }
 
     /**
@@ -111,4 +111,11 @@ public class ApiAppController extends BaseController {
         }
         return success(userNoticeContent);
     }
+
+    @PostMapping("/checkCaptchaCode")
+    @ApiOperation("验证短信验证码")
+    public AjaxResult checkCaptchaCode(@RequestBody Map<String, String> map) {
+        appUserService.checkCaptchaCode(map.get("phoneNumber"), map.get("captchaCode"));
+        return success();
+    }
 }

eitc-patient-app/src/main/java/com/eitc/patient/controller/AppLoginController.java

@@ -90,15 +90,8 @@ public class AppLoginController extends BaseController {
      */
     @PostMapping("/sendCaptchaCode")
     @ApiOperation("获取短信验证码")
-    public AjaxResult sendCaptchaCode(String phoneNumber) throws ClientException {
-        return appUserService.sendCaptchaCode(phoneNumber);
-    }
-
-    @PostMapping("/checkCaptchaCode")
-    @ApiOperation("验证短信验证码")
-    public AjaxResult checkCaptchaCode(String phoneNumber, String captchaCode) {
-        appUserService.checkCaptchaCode(phoneNumber, captchaCode);
-        return success();
+    public AjaxResult sendCaptchaCode(@RequestBody Map<String, String> map) throws ClientException {
+        return appUserService.sendCaptchaCode(map.get("phoneNumber"));
     }
 
     /**

eitc-patient-base/src/main/java/com/eitc/patient/domain/AppUser.java

@@ -29,7 +29,7 @@ public class AppUser extends EitcBaseEntity {
     private String password;
 
     @TableField(value = "identification_card")
-    @ApiModelProperty(value = "手机号码", name = "identificationCard")
+    @ApiModelProperty(value = "身份证号", name = "identificationCard")
     private String identificationCard;
 
     @TableField(value = "avatar")

eitc-patient-base/src/main/java/com/eitc/patient/domain/DiagnosisManage.java

@@ -0,0 +1,46 @@
+package com.eitc.patient.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.eitc.common.core.domain.EitcBaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * DiagnosisManage
+ *
+ * @author mtx
+ * @date: 2024/05/17 14:41
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("诊断管理表")
+@TableName("erm_diagnosis_manage")
+public class DiagnosisManage extends EitcBaseEntity {
+
+    @TableField(value = "diagnosis_code")
+    @ApiModelProperty(value = "诊断编码", name = "diagnosisCode")
+    @NotBlank(message = "诊断编码不能为空")
+    @Size(max = 50, message = "诊断编码长度不能超过50个字符")
+    private String diagnosisCode;
+
+    @TableField(value = "diagnosis_name")
+    @ApiModelProperty(value = "诊断名称", name = "diagnosisName")
+    @NotBlank(message = "诊断名称不能为空")
+    @Size(max = 50, message = "诊断名称长度不能超过50个字符")
+    private String diagnosisName;
+
+    @TableField(value = "diagnosis_name_pinyin_first_letter")
+    @ApiModelProperty(value = "诊断名称首拼", name = "diagnosisNamePinyinFirstLetter")
+    private String diagnosisNamePinyinFirstLetter;
+
+    @TableField(value = "diagnosis_name_pinyin")
+    @ApiModelProperty(value = "诊断名称拼音", name = "diagnosisNamePinyin")
+    private String diagnosisNamePinyin;
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/domain/DiagnosisType.java

@@ -27,10 +27,22 @@ public class DiagnosisType extends EitcBaseEntity {
     @ApiModelProperty(value = "父级id", name = "parentId")
     private String parentId;
 
+    @TableField(value = "ancestors")
+    @ApiModelProperty(value = "祖籍", name = "ancestors")
+    private String ancestors;
+
     @TableField(value = "diagnosis_name")
     @ApiModelProperty(value = "诊断名称", name = "diagnosisName")
     @NotBlank(message = "诊断名称不能为空")
     @Size(max = 50, message = "诊断名称长度不能超过50个字符")
     private String diagnosisName;
 
+    @TableField(value = "diagnosis_name_pinyin_first_letter")
+    @ApiModelProperty(value = "诊断名称首拼", name = "diagnosisNamePinyinFirstLetter")
+    private String diagnosisNamePinyinFirstLetter;
+
+    @TableField(value = "diagnosis_name_pinyin")
+    @ApiModelProperty(value = "诊断名称拼音", name = "diagnosisNamePinyin")
+    private String diagnosisNamePinyin;
+
 }

eitc-patient-base/src/main/java/com/eitc/patient/domain/DiagnosisTypeTemplate.java

@@ -32,25 +32,84 @@ public class DiagnosisTypeTemplate extends EitcBaseEntity {
     @NotBlank(message = "模板名称不能为空")
     private String templateName;
 
-    @TableField(value = "template_example")
-    @ApiModelProperty(value = "模板示例", name = "templateExample")
-    @NotBlank(message = "模板示例不能为空")
-    private String templateExample;
-
-    @TableField(value = "template_info")
-    @ApiModelProperty(value = "模板信息", name = "templateInfo")
-    private String templateInfo;
-
-    @TableField(value = "template_option")
-    @ApiModelProperty(value = "模板选项", name = "templateOption")
-    private String templateOption;
-
-    @TableField(value = "review_status")
-    @ApiModelProperty(value = "审核状态（1待审核，2已审核）", name = "reviewStatus")
-    private Integer reviewStatus;
-
-    @TableField(value = "order_num")
-    @ApiModelProperty(value = "排序", name = "orderNum")
-    private Integer orderNum;
+    @TableField(value = "name_pinyin_first_letter")
+    @ApiModelProperty(value = "诊断名称首拼", name = "namePinyinFirstLetter")
+    private String namePinyinFirstLetter;
+
+    @TableField(value = "name_pinyin")
+    @ApiModelProperty(value = "诊断名称拼音", name = "namePinyin")
+    private String namePinyin;
+
+    @TableField(value = "template_desc")
+    @ApiModelProperty(value = "模板描述", name = "templateDesc")
+    private String templateDesc;
+
+    @TableField(value = "diagnosis_manage_id")
+    @ApiModelProperty(value = "诊断管理id", name = "diagnosisManageId")
+    private String diagnosisManageId;
+
+    @TableField(value = "diagnosis_manage_name")
+    @ApiModelProperty(value = "诊断管理名称", name = "diagnosisManageName")
+    private String diagnosisManageName;
+
+    @TableField(value = "apply_dept")
+    @ApiModelProperty(value = "适用科室", name = "applyDept")
+    private String applyDept;
+
+    @TableField(value = "visit_type")
+    @ApiModelProperty(value = "就诊类型（1初诊，2复诊）", name = "visitType")
+    private Integer visitType;
+
+    @TableField(value = "enable_status")
+    @ApiModelProperty(value = "启用状态（1启用，0未启用）", name = "enableStatus")
+    private Integer enableStatus;
+
+    @TableField(value = "chief_complaint_content")
+    @ApiModelProperty(value = "主诉内容", name = "chiefComplaintContent")
+    private String chiefComplaintContent;
+
+    @TableField(value = "chief_complaint_option")
+    @ApiModelProperty(value = "主诉选项", name = "chiefComplaintOption")
+    private String chiefComplaintOption;
+
+    @TableField(value = "present_illness_content")
+    @ApiModelProperty(value = "现病史内容", name = "presentIllnessContent")
+    private String presentIllnessContent;
+
+    @TableField(value = "present_illness_option")
+    @ApiModelProperty(value = "现病史选项", name = "presentIllnessOption")
+    private String presentIllnessOption;
+
+    @TableField(value = "inspect_content")
+    @ApiModelProperty(value = "检查内容", name = "inspectContent")
+    private String inspectContent;
+
+    @TableField(value = "inspect_option")
+    @ApiModelProperty(value = "检查选项", name = "inspectOption")
+    private String inspectOption;
+
+    @TableField(value = "treatment_planning_content")
+    @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
+    private String treatmentPlanningContent;
+
+    @TableField(value = "treatment_planning_option")
+    @ApiModelProperty(value = "治疗计划选项", name = "treatmentPlanningOption")
+    private String treatmentPlanningOption;
+
+    @TableField(value = "dispose_content")
+    @ApiModelProperty(value = "处置内容", name = "disposeContent")
+    private String disposeContent;
+
+    @TableField(value = "dispose_option")
+    @ApiModelProperty(value = "处置选项", name = "disposeOption")
+    private String disposeOption;
+
+    @TableField(value = "note_content")
+    @ApiModelProperty(value = "便签", name = "note_content")
+    private String noteContent;
+
+    @TableField(value = "note_option")
+    @ApiModelProperty(value = "便签", name = "noteOption")
+    private String noteOption;
 
 }

eitc-patient-base/src/main/java/com/eitc/patient/domain/ImageRecord.java

@@ -0,0 +1,35 @@
+package com.eitc.patient.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.eitc.common.core.domain.EitcBaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * ImageRecord
+ *
+ * @author mtx
+ * @date: 2024-09-12 13:59:30
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("影像记录")
+@TableName("erm_image_record")
+public class ImageRecord extends EitcBaseEntity {
+
+    @TableField(value = "identification_card")
+    @ApiModelProperty(value = "身份证号", name = "identificationCard")
+    private String identificationCard;
+
+    @TableField(value = "image_url")
+    @ApiModelProperty(value = "影像路径", name = "imageUrl")
+    private String imageUrl;
+
+    @TableField(value = "full_image_url")
+    @ApiModelProperty(value = "影像全路径", name = "fullImageUrl")
+    private String fullImageUrl;
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/domain/MedicalRecord.java

@@ -54,4 +54,36 @@ public class MedicalRecord extends EitcBaseEntity {
     @ApiModelProperty(value = "费用", name = "cost")
     private BigDecimal cost;
 
+    @TableField(value = "chief_complaint_content")
+    @ApiModelProperty(value = "主诉内容", name = "chiefComplaintContent")
+    private String chiefComplaintContent;
+
+    @TableField(value = "present_illness_content")
+    @ApiModelProperty(value = "现病史内容", name = "presentIllnessContent")
+    private String presentIllnessContent;
+
+    @TableField(value = "inspect_content")
+    @ApiModelProperty(value = "检查内容", name = "inspectContent")
+    private String inspectContent;
+
+    @TableField(value = "treatment_planning_content")
+    @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
+    private String treatmentPlanningContent;
+
+    @TableField(value = "dispose_content")
+    @ApiModelProperty(value = "处置内容", name = "disposeContent")
+    private String disposeContent;
+
+    @TableField(value = "note_content")
+    @ApiModelProperty(value = "便签", name = "noteContent")
+    private String noteContent;
+
+    @TableField(value = "diagnosis_content")
+    @ApiModelProperty(value = "诊断", name = "diagnosisContent")
+    private String diagnosisContent;
+
+    @TableField(value = "save_status")
+    @ApiModelProperty(value = "保存状态（1保存，2提交））", name = "saveStatus")
+    private Integer saveStatus;
+
 }

eitc-patient-base/src/main/java/com/eitc/patient/domain/MedicalRecordDetails.java

@@ -24,18 +24,6 @@ public class MedicalRecordDetails extends EitcBaseEntity {
     @ApiModelProperty(value = "病历id", name = "medicalRecordId")
     private String medicalRecordId;
 
-    @TableField(value = "diagnosis_type_template_id")
-    @ApiModelProperty(value = "诊断分类模板id", name = "diagnosisTypeTemplateId")
-    private String diagnosisTypeTemplateId;
-
-    @TableField(value = "diagnosis_type_id")
-    @ApiModelProperty(value = "诊断分类id", name = "diagnosisTypeId")
-    private String diagnosisTypeId;
-
-    @TableField(value = "diagnosis_type_name")
-    @ApiModelProperty(value = "诊断分类名称", name = "diagnosisTypeName")
-    private String diagnosisTypeName;
-
     @TableField(value = "tooth_position")
     @ApiModelProperty(value = "牙位", name = "toothPosition")
     private String toothPosition;
@@ -44,32 +32,12 @@ public class MedicalRecordDetails extends EitcBaseEntity {
     @ApiModelProperty(value = "牙位状态（1未完成，2已完成治疗）", name = "toothStatus")
     private Integer toothStatus;
 
-    @TableField(value = "template_name")
-    @ApiModelProperty(value = "模板名称", name = "templateName")
-    private String templateName;
-
-    @TableField(value = "template_example")
-    @ApiModelProperty(value = "模板示例", name = "templateExample")
-    private String templateExample;
+    @TableField(value = "diagnosis_manage_id")
+    @ApiModelProperty(value = "诊断管理id", name = "diagnosisManageId")
+    private String diagnosisManageId;
 
-    @TableField(value = "template_info")
-    @ApiModelProperty(value = "模板信息", name = "templateInfo")
-    private String templateInfo;
-
-    @TableField(value = "content_info")
-    @ApiModelProperty(value = "内容信息", name = "contentInfo")
-    private String contentInfo;
-
-    @TableField(value = "template_option")
-    @ApiModelProperty(value = "模板选项", name = "templateOption")
-    private String templateOption;
-
-    @TableField(value = "template_view")
-    @ApiModelProperty(value = "模板选项", name = "template_view")
-    private String templateView;
-
-    @TableField(value = "order_num")
-    @ApiModelProperty(value = "排序", name = "orderNum")
-    private Integer orderNum;
+    @TableField(value = "diagnosis_type_template_id")
+    @ApiModelProperty(value = "病例模板id", name = "diagnosisTypeTemplateId")
+    private String diagnosisTypeTemplateId;
 
 }

eitc-patient-base/src/main/java/com/eitc/patient/dto/DiagnosisTypeTemplateDto.java

@@ -1,10 +1,9 @@
 package com.eitc.patient.dto;
 
-import com.eitc.patient.domain.DiagnosisTypeTemplate;
+import com.alibaba.fastjson2.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -14,22 +13,76 @@ import java.util.List;
  * @author mtx
  * @date: 2024/05/30 11:06
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("诊断分类模板表")
-public class DiagnosisTypeTemplateDto extends DiagnosisTypeTemplate {
+public class DiagnosisTypeTemplateDto {
 
-    @ApiModelProperty(value = "患者病史", name = "patientMedicalRecord")
-    private String patientMedicalRecord;
+    @ApiModelProperty(value = "患者id", name = "patientId")
+    private String patientId;
 
-    @ApiModelProperty(value = "医生录入病史", name = "doctorMedicalRecord")
-    private String doctorMedicalRecord;
+    @ApiModelProperty(value = "患者过敏史", name = "patientAllergyHistory")
+    private List<String> patientAllergyHistory;
 
-    @ApiModelProperty(value = "模板示例", name = "templateExample2")
-    private String templateExample2;
+    @ApiModelProperty(value = "医生过敏史", name = "doctorAllergyHistory")
+    private List<String> doctorAllergyHistory;
 
-    private List<String> formattedPartsList;
+    @ApiModelProperty(value = "患者既往史", name = "patientPastHistory")
+    private List<String> patientPastHistory;
 
-    private boolean flag = false;
+    @ApiModelProperty(value = "医生既往史", name = "doctorPastHistory")
+    private List<String> doctorPastHistory;
+
+    @ApiModelProperty(value = "患者家族史", name = "patientFamilyHistory")
+    private List<String> patientFamilyHistory;
+
+    @ApiModelProperty(value = "医生家族史", name = "doctorFamilyHistory")
+    private List<String> doctorFamilyHistory;
+
+    @ApiModelProperty(value = "诊断-主诊断", name = "mainDiagnosis")
+    private String mainDiagnosis;
+
+    @ApiModelProperty(value = "诊断-主诊断id", name = "mainDiagnosisId")
+    private String mainDiagnosisId;
+
+    @ApiModelProperty(value = "诊断-其他诊断诊断", name = "otherDiagnosis")
+    private List<String> otherDiagnosis;
+
+    @ApiModelProperty(value = "主诉内容", name = "chiefComplaintContent")
+    private String chiefComplaintContent;
+
+    @ApiModelProperty(value = "主诉选项", name = "chiefComplaintOption")
+    private JSONObject chiefComplaintOption;
+
+    @ApiModelProperty(value = "现病史内容", name = "presentIllnessContent")
+    private String presentIllnessContent;
+
+    @ApiModelProperty(value = "现病史选项", name = "presentIllnessOption")
+    private JSONObject presentIllnessOption;
+
+    @ApiModelProperty(value = "检查内容", name = "inspectContent")
+    private String inspectContent;
+
+    @ApiModelProperty(value = "检查选项", name = "inspectOption")
+    private JSONObject inspectOption;
+
+    @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
+    private String treatmentPlanningContent;
+
+    @ApiModelProperty(value = "治疗计划选项", name = "treatmentPlanningOption")
+    private JSONObject treatmentPlanningOption;
+
+    @ApiModelProperty(value = "处置内容", name = "disposeContent")
+    private String disposeContent;
+
+    @ApiModelProperty(value = "处置选项", name = "disposeOption")
+    private JSONObject disposeOption;
+
+    @ApiModelProperty(value = "便签", name = "noteContent")
+    private String noteContent;
+
+    @ApiModelProperty(value = "便签", name = "noteOption")
+    private JSONObject noteOption;
+
+    private String id;
 
 }

eitc-patient-base/src/main/java/com/eitc/patient/excel/DiagnosisManageTemplateExcel.java

@@ -0,0 +1,30 @@
+package com.eitc.patient.excel;
+
+import com.eitc.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * DiagnosisManageTemplateExcel
+ *
+ * @author mtx
+ * @date: 2024/05/20 15:34
+ */
+@Data
+@ApiModel("诊断管理模板导入")
+public class DiagnosisManageTemplateExcel {
+
+    @Excel(name = "诊断编码", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "诊断编码", name = "diagnosisCode")
+    private String diagnosisCode;
+
+    @Excel(name = "诊断名称", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "诊断名称", name = "diagnosisName")
+    private String diagnosisName;
+
+    @Excel(name = "返回信息", type = Excel.Type.EXPORT)
+    @ApiModelProperty(value = "返回信息", name = "msg")
+    private String msg;
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/excel/DiagnosisTypeTemplateExcel.java

@@ -15,13 +15,73 @@ import lombok.Data;
 @ApiModel("诊断分类模板导入")
 public class DiagnosisTypeTemplateExcel {
 
-    @Excel(name = "项目", type = Excel.Type.ALL)
+    @Excel(name = "一级分类", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "一级分类", name = "classifyOne")
+    private String classifyOne;
+
+    @Excel(name = "二级分类", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "二级分类", name = "classifyTwo")
+    private String classifyTwo;
+
+    @Excel(name = "三级分类", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "三级分类", name = "classifyThree")
+    private String classifyThree;
+
+    @Excel(name = "四级分类", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "四级分类", name = "classifyFour")
+    private String classifyFour;
+
+    @Excel(name = "五级分类", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "五级分类", name = "classifyFive")
+    private String classifyFive;
+
+    @Excel(name = "六级分类", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "六级分类", name = "classifySix")
+    private String classifySix;
+
+    @Excel(name = "模板名称", type = Excel.Type.ALL)
     @ApiModelProperty(value = "模板名称", name = "templateName")
     private String templateName;
 
-    @Excel(name = "模版示例(该文档内容为示例,请根据实际诊断病历填写内容)", type = Excel.Type.ALL)
-    @ApiModelProperty(value = "模版示例", name = "templateExample")
-    private String templateExample;
+    @Excel(name = "诊断名称", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "诊断管理名称", name = "diagnosisManageName")
+    private String diagnosisManageName;
+
+    @Excel(name = "模板描述", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "模板描述", name = "templateDesc")
+    private String templateDesc;
+
+    @Excel(name = "适用科室", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "适用科室", name = "applyDept")
+    private String applyDept;
+
+    @Excel(name = "就诊类型", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "就诊类型（1初诊，2复诊）", name = "visitType")
+    private String visitType;
+
+    @Excel(name = "主诉", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "主诉内容", name = "chiefComplaintContent")
+    private String chiefComplaintContent;
+
+    @Excel(name = "现病史", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "现病史内容", name = "presentIllnessContent")
+    private String presentIllnessContent;
+
+    @Excel(name = "检查", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "检查内容", name = "inspectContent")
+    private String inspectContent;
+
+    @Excel(name = "治疗计划", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
+    private String treatmentPlanningContent;
+
+    @Excel(name = "处置", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "处置内容", name = "disposeContent")
+    private String disposeContent;
+
+    @Excel(name = "便签", type = Excel.Type.ALL)
+    @ApiModelProperty(value = "便签", name = "noteContent")
+    private String noteContent;
 
     @Excel(name = "返回信息", type = Excel.Type.EXPORT)
     @ApiModelProperty(value = "返回信息", name = "msg")

eitc-patient-base/src/main/java/com/eitc/patient/mapper/DiagnosisManageMapper.java

@@ -0,0 +1,16 @@
+package com.eitc.patient.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.eitc.patient.domain.DiagnosisManage;
+import com.eitc.patient.domain.DiagnosisType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * DiagnosisManageMapper
+ *
+ * @author mtx
+ * @date: 2024/05/17 15:31
+ */
+@Mapper
+public interface DiagnosisManageMapper extends BaseMapper<DiagnosisManage> {
+}

eitc-patient-base/src/main/java/com/eitc/patient/mapper/ImageRecordMapper.java

@@ -0,0 +1,15 @@
+package com.eitc.patient.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.eitc.patient.domain.ImageRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * ImageRecordMapper
+ *
+ * @author mtx
+ * @date: 2024/06/11 17:39
+ */
+@Mapper
+public interface ImageRecordMapper extends BaseMapper<ImageRecord> {
+}

eitc-patient-base/src/main/java/com/eitc/patient/mapper/MedicalRecordDetailsMapper.java

@@ -17,20 +17,4 @@ import java.util.Map;
  */
 @Mapper
 public interface MedicalRecordDetailsMapper extends BaseMapper<MedicalRecordDetails> {
-
-    /**
-     * 统计诊断分类
-     *
-     * @return 统计结果
-     * @author mtx
-     * @date: 2024/6/5 9:10
-     */
-    List<Map<String, String>> countByDiagnosisTypeName();
-
-    /**
-     * 根据牙齿位置检查访问类型
-     *
-     * @return 返回访问类型，具体类型根据业务逻辑确定
-     */
-    List<MedicalRecord> findListByToothPosition(MedicalRecordHistoryDto dto);
 }

eitc-patient-base/src/main/java/com/eitc/patient/mapper/MedicalRecordMapper.java

@@ -2,10 +2,12 @@ package com.eitc.patient.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.eitc.patient.domain.MedicalRecord;
+import com.eitc.patient.dto.MedicalRecordHistoryDto;
 import com.eitc.patient.dto.MedicalRecordListDto;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * MedicalRecordMapper
@@ -25,4 +27,22 @@ public interface MedicalRecordMapper extends BaseMapper<MedicalRecord> {
      * @date: 2024/5/23 9:17
      */
     List<MedicalRecordListDto> medicalRecordList(String searchParam);
+
+
+    /**
+     * 统计诊断分类
+     *
+     * @return 统计结果
+     * @author mtx
+     * @date: 2024/6/5 9:10
+     */
+    List<Map<String, String>> countByDiagnosisTypeName();
+
+    /**
+     * 根据牙齿位置检查访问类型
+     *
+     * @return 返回访问类型，具体类型根据业务逻辑确定
+     */
+    List<MedicalRecord> findListByToothPosition(MedicalRecordHistoryDto dto);
+
 }

eitc-patient-base/src/main/java/com/eitc/patient/dto/MedicalRecordDto.java

@@ -1,4 +1,4 @@
-package com.eitc.patient.dto;
+package com.eitc.patient.param;
 
 import com.eitc.patient.domain.MedicalRecord;
 import io.swagger.annotations.ApiModel;
@@ -6,10 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
- * MedicalRecordVO
+ * MedicalRecordListParam
  *
  * @author mtx
  * @date: 2024/05/17 14:42
@@ -17,7 +15,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("病例表")
-public class MedicalRecordDto extends MedicalRecord {
+public class MedicalRecordListParam extends MedicalRecord {
 
     @ApiModelProperty(value = "查询范围", name = "queryScope")
     private Long queryScope;

eitc-patient-base/src/main/java/com/eitc/patient/param/MedicalRecordParam.java

@@ -0,0 +1,25 @@
+package com.eitc.patient.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * MedicalRecordParam
+ *
+ * @author mtx
+ * @date: 2024/08/21 13:49
+ */
+@Data
+public class MedicalRecordParam {
+
+    @ApiModelProperty(value = "患者id", name = "patientId")
+    private String patientId;
+
+    @ApiModelProperty(value = "主诊断", name = "diagnosisTypeTemplateId")
+    private String diagnosisTypeTemplateId;
+
+    @ApiModelProperty(value = "其他诊断", name = "otherDiagnosisTypeTemplateIdList")
+    private List<String> otherDiagnosisTypeTemplateIdList;
+}

eitc-patient-base/src/main/java/com/eitc/patient/param/MedicalRecordSaveParam.java

@@ -0,0 +1,76 @@
+package com.eitc.patient.param;
+
+import com.eitc.patient.vo.MedicalRecordToothVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * MedicalRecordSaveParam
+ *
+ * @author mtx
+ * @date: 2024/08/22 16:34
+ */
+@Data
+@ApiModel("病例保存表")
+public class MedicalRecordSaveParam {
+
+    private String id;
+
+    @ApiModelProperty(value = "医生过敏史", name = "doctorAllergyHistory")
+    private List<String> doctorAllergyHistory;
+
+    @ApiModelProperty(value = "医生既往史", name = "doctorPastHistory")
+    private List<String> doctorPastHistory;
+
+    @ApiModelProperty(value = "医生家族史", name = "doctorFamilyHistory")
+    private List<String> doctorFamilyHistory;
+
+    @ApiModelProperty(value = "患者id", name = "patientId")
+    private String patientId;
+
+    @ApiModelProperty(value = "预约id", name = "appointmentId")
+    private String appointmentId;
+
+    @ApiModelProperty(value = "就诊类型（1初诊，2复诊）", name = "visitType")
+    private Integer visitType;
+
+    @ApiModelProperty(value = "主治医生", name = "attendingDoctorId")
+    private Long attendingDoctorId;
+
+    @ApiModelProperty(value = "预约门诊", name = "outpatientService")
+    private String outpatientService;
+
+    @ApiModelProperty(value = "预约科室", name = "department")
+    private String department;
+
+    @ApiModelProperty(value = "主诉内容", name = "chiefComplaintContent")
+    private String chiefComplaintContent;
+
+    @ApiModelProperty(value = "现病史内容", name = "presentIllnessContent")
+    private String presentIllnessContent;
+
+    @ApiModelProperty(value = "检查内容", name = "inspectContent")
+    private String inspectContent;
+
+    @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
+    private String treatmentPlanningContent;
+
+    @ApiModelProperty(value = "处置内容", name = "disposeContent")
+    private String disposeContent;
+
+    @ApiModelProperty(value = "便签", name = "noteContent")
+    private String noteContent;
+
+    @ApiModelProperty(value = "诊断", name = "diagnosisContent")
+    private String diagnosisContent;
+
+    @ApiModelProperty(value = "保存状态（1保存，2提交）", name = "saveStatus")
+    private Integer saveStatus;
+
+
+    List<MedicalRecordToothVO> toothList;
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/service/IDiagnosisManageService.java

@@ -0,0 +1,26 @@
+package com.eitc.patient.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.eitc.patient.domain.DiagnosisManage;
+import com.eitc.patient.excel.DiagnosisManageTemplateExcel;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * IDiagnosisManageService
+ *
+ * @author mtx
+ * @date: 2024/05/17 15:36
+ */
+@Service
+public interface IDiagnosisManageService extends IService<DiagnosisManage> {
+
+    /**
+     * 导入模板数据
+     *
+     * @param list 待导入的诊断管理模板Excel列表
+     * @return 导入失败的诊断管理模板Excel列表，包含错误信息
+     */
+    List<DiagnosisManageTemplateExcel> importTemplate(List<DiagnosisManageTemplateExcel> list);
+}

eitc-patient-base/src/main/java/com/eitc/patient/service/IDiagnosisTypeService.java

@@ -47,7 +47,22 @@ public interface IDiagnosisTypeService extends IService<DiagnosisType> {
     /**
      * 获取树形结构
      *
-     * @return 树形结构
+     * @param searchParam 搜索信息
+     * @param visitType   状态
+     * @return 返回结果
+     * @author mtx
+     * @date: 2024/8/21 9:36
+     */
+    List<DiagnosisTypeTree> findTreeList(String searchParam, String visitType);
+
+    /**
+     * 检查是否可以添加诊断类型
+     * 此方法主要进行两个重要检查：
+     * 1. 确保传入的诊断类型ID不为空，因为这是添加新诊断类型的必要条件
+     * 2. 检查传入的诊断类型ID是否已经有子类型存在，如果存在子类型，则不允许添加新的诊断类型
+     *
+     * @param diagnosisTypeId 诊断类型ID，用于检查和添加新的诊断类型
+     * @throws IllegalArgumentException 如果诊断类型ID为空或存在子类型，则抛出此异常
      */
-    List<DiagnosisTypeTree> findTreeList();
+    void checkAddDiagnosisType(String diagnosisTypeId);
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/IDiagnosisTypeTemplateService.java

@@ -5,9 +5,7 @@ import com.eitc.patient.domain.DiagnosisTypeTemplate;
 import com.eitc.patient.excel.DiagnosisTypeTemplateExcel;
 import com.eitc.patient.vo.DiagnosisTypeTemplateSaveVO;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -19,43 +17,41 @@ import java.util.List;
 @Service
 public interface IDiagnosisTypeTemplateService extends IService<DiagnosisTypeTemplate> {
 
-    /**
-     * 获取模板选项的json串
-     *
-     * @param templateExample 要获取json串的示例
-     * @return json串
-     * @author mtx
-     * @date: 2024/5/20 14:50
-     */
-    String findTemplateOptionJson(String templateExample);
 
     /**
-     * 获取模板数据的json串
+     * 根据提供的模板示例字符串，查找并生成模板选项的JSON表示
      *
-     * @param templateExample 要获取json串的示例
+     * @param jsonContent 要获取json串的示例
      * @return json串
      * @author mtx
      * @date: 2024/5/20 14:50
      */
-    String findTemplateInfo(String templateExample);
+    String findTemplateInfo(String jsonContent);
 
     /**
      * 导入诊断分类模板
      *
-     * @param file            文件
+     * @param list            数据
      * @param diagnosisTypeId 诊断分类id
      * @return 错误信息
      * @author mtx
      * @date: 2024/5/20 15:27
      */
-    List<DiagnosisTypeTemplateExcel> importTemplate(MultipartFile file, String diagnosisTypeId) throws IOException;
+    List<DiagnosisTypeTemplateExcel> importTemplate(List<DiagnosisTypeTemplateExcel> list, String diagnosisTypeId);
+
+    /**
+     * 新增诊断模板
+     * @param entry 参数
+     * @author mtx
+     * @date: 2024/6/7 14:06
+     */
+    void add(DiagnosisTypeTemplateSaveVO entry);
 
     /**
-     * 新增或修改诊断模板
+     * 修改诊断模板
      * @param entry 参数
-     * @return 返回值
      * @author mtx
      * @date: 2024/6/7 14:06
      */
-    boolean add(DiagnosisTypeTemplateSaveVO entry);
+    void edit(DiagnosisTypeTemplateSaveVO entry);
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/IImageRecordService.java

@@ -0,0 +1,16 @@
+package com.eitc.patient.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.eitc.patient.domain.ImageRecord;
+import org.springframework.stereotype.Service;
+
+/**
+ * IImageRecordService
+ *
+ * @author mtx
+ * @date: 2024/06/11 17:37
+ */
+@Service
+public interface IImageRecordService extends IService<ImageRecord> {
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/service/IMedicalHistoryService.java

@@ -2,7 +2,7 @@ package com.eitc.patient.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.eitc.patient.domain.MedicalHistory;
-import com.eitc.patient.dto.DiagnosisTypeTemplateDto;
+import com.eitc.patient.param.MedicalRecordSaveParam;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -56,21 +56,21 @@ public interface IMedicalHistoryService extends IService<MedicalHistory> {
     /**
      * 查询患者的病史保存到历史记录中
      *
-     * @param patientId       患者id
-     * @param medicalRecordId 病历id
+     * @param param           参数
+     * @param medicalRecordId 病例id
      * @author mtx
      * @date: 2024/5/22 13:57
      */
-    void saveMedicalHistoryToMedicalRecordIdByPatientId(String patientId, String medicalRecordId);
+    void saveMedicalHistoryByHistoryType(MedicalRecordSaveParam param, String medicalRecordId);
 
     /**
-     * 查询患者的病史
+     * 根据患者ID、疾病类型和诊断类型模板详情，查询患者的病史信息。
+     * 此方法主要用于检索与特定疾病类型和患者相关的病史记录，并根据病史来源筛选出患者自述的病史内容。
      *
-     * @param patientId   患者id
-     * @param diseaseType 类型
-     * @param detailsVO   模板信息
+     * @param patientId   患者的唯一标识ID，用于查询特定患者的病史记录。
+     * @param diseaseType 疾病类型的标识，用于筛选特定类型的病史记录。
      * @author mtx
-     * @date: 2024/06/07 14:01
+     * @date 2024/06/07 14:01
      */
-    void findMedicalHistory(String patientId, Integer diseaseType, DiagnosisTypeTemplateDto detailsVO);
+    List<String> findMedicalHistory(String patientId, Integer diseaseType);
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/IMedicalRecordDetailsService.java

@@ -1,15 +1,9 @@
 package com.eitc.patient.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.eitc.patient.domain.MedicalRecord;
 import com.eitc.patient.domain.MedicalRecordDetails;
-import com.eitc.patient.dto.MedicalRecordHistoryDto;
-import com.eitc.patient.vo.MedicalRecordDetailsVO;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * MedicalRecordDetailsService
  *
@@ -19,27 +13,4 @@ import java.util.Map;
 @Service
 public interface IMedicalRecordDetailsService extends IService<MedicalRecordDetails> {
 
-    /**
-     * 通过病历id获取病历详情vo
-     * @param medicalRecordId 病历id
-     * @return 病历详情vo
-     * @author mtx
-     * @date: 2024/6/5 9:10
-     */
-    List<MedicalRecordDetailsVO> findMedicalRecordDetailsVOByMedicalRecordId(String medicalRecordId);
-
-    /**
-     * 统计诊断分类
-     * @return 统计结果
-     * @author mtx
-     * @date: 2024/6/5 9:10
-     */
-    List<Map<String, String>> countByDiagnosisTypeName();
-
-    /**
-     * 根据牙齿位置检查访问类型
-     *
-     * @return 返回访问类型，具体类型根据业务逻辑确定
-     */
-    List<MedicalRecord> findListByToothPosition(MedicalRecordHistoryDto dto);
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/IMedicalRecordService.java

@@ -2,11 +2,13 @@ package com.eitc.patient.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.eitc.patient.domain.MedicalRecord;
+import com.eitc.patient.dto.MedicalRecordHistoryDto;
 import com.eitc.patient.dto.MedicalRecordListDto;
-import com.eitc.patient.vo.MedicalRecordParamVO;
+import com.eitc.patient.param.MedicalRecordSaveParam;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * MedicalRecordService
@@ -19,28 +21,37 @@ public interface IMedicalRecordService extends IService<MedicalRecord> {
 
     /**
      * 保存病历
+     *
      * @param vo 参数
      * @author mtx
      * @date: 2024/5/22 10:00
      */
-    void addOrEdit(MedicalRecordParamVO vo);
+    void addOrEdit(MedicalRecordSaveParam vo);
 
     /**
-     * 封装病历信息
+     * 病历列表
      *
-     * @param medicalRecord 病历信息
-     * @return 病历信息
+     * @param searchParam 病历信息
+     * @return 病历列表
      * @author mtx
      * @date: 2024/5/23 9:17
      */
-    MedicalRecordParamVO getMedicalRecordVO(MedicalRecord medicalRecord);
+    List<MedicalRecordListDto> medicalRecordList(String searchParam);
 
     /**
-     * 病历列表
-     * @param searchParam 病历信息
-     * @return 病历列表
+     * 统计诊断分类
+     *
+     * @return 统计结果
      * @author mtx
-     * @date: 2024/5/23 9:17
+     * @date: 2024/6/5 9:10
      */
-    List<MedicalRecordListDto> medicalRecordList(String searchParam);
+    List<Map<String, String>> countByDiagnosisTypeName();
+
+    /**
+     * 根据牙齿位置检查访问类型
+     *
+     * @return 返回访问类型，具体类型根据业务逻辑确定
+     */
+    List<MedicalRecord> findListByToothPosition(MedicalRecordHistoryDto dto);
+
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/AppUserServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.core.domain.entity.SysUser;
 import com.eitc.common.core.redis.RedisCache;
+import com.eitc.common.utils.CryptoUtil;
 import com.eitc.common.utils.JWTUtil;
 import com.eitc.common.utils.PatientBaseUtil;
 import com.eitc.common.utils.SecurityUtils;
@@ -23,6 +24,7 @@ import com.eitc.patient.service.IPatientService;
 import com.eitc.patient.vo.AppUserPatientVO;
 import com.eitc.patient.vo.PatientVO;
 import com.eitc.system.service.ISysUserService;
+import com.eitc.system.utils.SendSmsUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -77,24 +79,24 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         // 校验验证码发送是否超过限制
         String key = PatientConstant.ERM_APP_CAPTCHA_CODE + phoneNumber;
         String repeat = key + ":repeat";
-        int repeatNum = 1;
+        int repeatNum = 1, timeout = 30;
         if (redisCache.hasKey(repeat)) {
             repeatNum = redisCache.getCacheObject(repeat);
             int num = maxRetryCount;
             if (repeatNum >= num) {
-                return AjaxResult.error("验证码发送次数超过" + num + "次，请稍后再试");
+                return AjaxResult.error("验证码发送次数超过" + num + "次，请" + timeout + "分钟后再试");
             }
             repeatNum++;
         }
-        redisCache.setCacheObject(repeat, repeatNum, 30, TimeUnit.MINUTES);
+        redisCache.setCacheObject(repeat, repeatNum, timeout, TimeUnit.MINUTES);
 
         // 生成验证码
         int captchaCode = PatientBaseUtil.getCaptchaCode();
-        // 发送短信 todo
-//        SendSmsUtil.sendSmsToLogin(phoneNumber, String.valueOf(captchaCode));
+        // 发送短信
+        SendSmsUtil.sendSmsToLogin(phoneNumber, String.valueOf(captchaCode));
         // 缓存验证码
         redisCache.setCacheObject(key, captchaCode, 5, TimeUnit.MINUTES);
-        return AjaxResult.success(captchaCode);
+        return AjaxResult.success();
     }
 
     /**
@@ -139,34 +141,25 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      */
     private Map<String, String> generateTokenToApp(Map<String, String> map, String loginType) {
         String phoneNumber = map.get("phoneNumber");
-        AppUser appUser;
+        AppUser user = getAppUserByPhoneNumber(phoneNumber);
+        if (Objects.isNull(user)) {
+            throw new RuntimeException(phoneNumber + "用户不存在");
+        }
         // 登录
         if (String.valueOf(AppUserLoginTypeEnum.ACCOUNT.getCode()).equals(loginType)) {
             // 账号密码登录
-            String password = map.get("password");
-            if (StringUtils.isBlank(password)) {
+            String encryptPassword = map.get("password");
+            if (StringUtils.isBlank(encryptPassword)) {
                 throw new RuntimeException("密码不能为空");
             }
-            AppUser user = getAppUserByPhoneNumber(phoneNumber);
-            if (Objects.isNull(user)) {
-                throw new RuntimeException(phoneNumber + "用户不存在或密码错误");
-            }
-            appUser = user;
-            boolean flag = SecurityUtils.matchesPassword(password, appUser.getPassword());
+            String decryptPassword = CryptoUtil.decrypt(encryptPassword);
+            boolean flag = SecurityUtils.matchesPassword(decryptPassword, user.getPassword());
             if (!flag) {
                 throw new RuntimeException("用户不存在或密码错误");
             }
-        } else if (String.valueOf(AppUserLoginTypeEnum.CAPTCHA.getCode()).equals(loginType)) {
-            AppUser user = getAppUserByPhoneNumber(phoneNumber);
-            if (Objects.isNull(user)) {
-                throw new RuntimeException(phoneNumber + "用户不存在");
-            }
-            appUser = user;
-        } else {
-            throw new RuntimeException("登录方式错误");
         }
         // 生成token
-        return getTokenByAppUserInfo(appUser);
+        return getTokenByAppUserInfo(user);
     }
 
     /**
@@ -180,34 +173,25 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      */
     private Map<String, String> generateTokenToPC(Map<String, String> map, String loginType) {
         String phoneNumber = map.get("phoneNumber");
-        SysUser user;
+        SysUser sysUser = getPCUserByPhoneNumber(phoneNumber);
+        if (Objects.isNull(sysUser)) {
+            throw new RuntimeException(phoneNumber + "用户不存在");
+        }
         // 登录
         if (String.valueOf(AppUserLoginTypeEnum.ACCOUNT.getCode()).equals(loginType)) {
             // 账号密码登录
-            String password = map.get("password");
-            if (StringUtils.isBlank(password)) {
+            String encryptPassword = map.get("password");
+            if (StringUtils.isBlank(encryptPassword)) {
                 throw new RuntimeException("密码不能为空");
             }
-            SysUser sysUser = getPCUserByPhoneNumber(phoneNumber);
-            if (Objects.isNull(sysUser)) {
-                throw new RuntimeException("用户不存在或密码错误");
-            }
-            user = sysUser;
-            boolean flag = SecurityUtils.matchesPassword(password, sysUser.getPassword());
+            String decryptPassword = CryptoUtil.decrypt(encryptPassword);
+            boolean flag = SecurityUtils.matchesPassword(decryptPassword, sysUser.getPassword());
             if (!flag) {
                 throw new RuntimeException(phoneNumber + "用户不存在或密码错误");
             }
-        } else if (String.valueOf(AppUserLoginTypeEnum.CAPTCHA.getCode()).equals(loginType)) {
-            SysUser sysUser = getPCUserByPhoneNumber(phoneNumber);
-            if (Objects.isNull(sysUser)) {
-                throw new RuntimeException(phoneNumber + "用户不存在");
-            }
-            user = sysUser;
-        } else {
-            throw new RuntimeException("登录方式错误");
         }
         // 生成token
-        return getTokenByPCUserInfo(user);
+        return getTokenByPCUserInfo(sysUser);
     }
 
     /**
@@ -221,7 +205,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         payload.put("id", appUser.getId());
         payload.put("phoneNumber", appUser.getPhoneNumber());
         payload.put("identificationCard", appUser.getIdentificationCard());
-
+        payload.put("avatar", appUser.getAvatar());
         String secretKey = PatientBaseUtil.getSecretKey(appUser.getId());
         //生成JWt的令牌
         String token = JWTUtil.getToken(payload, secretKey);
@@ -240,6 +224,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         Map<String, String> payload = new HashMap<>();
         payload.put("id", userId);
         payload.put("phoneNumber", user.getPhonenumber());
+        payload.put("avatar", user.getAvatar());
         String secretKey = PatientBaseUtil.getSecretKey(userId);
         //生成JWt的令牌
         String token = JWTUtil.getToken(payload, secretKey);
@@ -269,7 +254,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
             repeatNum = redisCache.getCacheObject(repeat);
             // 如果当前重复次数超过最大允许次数，则抛出异常。
             if (repeatNum >= maxRetryCount) {
-                throw new RuntimeException("登录失败次数超过" + maxRetryCount + "次，请稍后再试");
+                throw new RuntimeException("登录失败次数超过" + maxRetryCount + "次，请" + lockTime + "分钟后再试");
             }
             // 本次登录尝试后，累计重复次数加1。
             repeatNum++;

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/CollectCostPatientsServiceImpl.java

@@ -23,7 +23,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -55,15 +54,21 @@ public class CollectCostPatientsServiceImpl extends ServiceImpl<CollectCostPatie
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public BigDecimal saveCollectCostPatientsToMedicalRecord(List<MedicalRecordDetails> recordDetailsList, String patientId) {
-        // 给病例详情分组，每颗牙是一个集合
-        Map<String, List<MedicalRecordDetails>> collect =
-                recordDetailsList.stream().collect(Collectors.groupingBy(MedicalRecordDetails::getToothPosition));
+        String medicalRecordId = recordDetailsList.get(0).getMedicalRecordId();
+        // 删除之前的收费，一个病例一个收费
+        List<CollectCostPatients> list = this.list(Wrappers.<CollectCostPatients>lambdaQuery().eq(CollectCostPatients::getMedicalRecordId, medicalRecordId));
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<String> collect = list.stream().map(CollectCostPatients::getId).collect(Collectors.toList());
+            // 删除已存在的与给定患者ID相关的费用采集详情
+            collectCostPatientsDetailsService.remove(Wrappers.<CollectCostPatientsDetails>lambdaQuery().in(CollectCostPatientsDetails::getCollectCostPatientsId, collect));
+            this.removeByIds(collect);
+        }
 
         // 先保存收费初始信息
-        CollectCostPatients collectCostPatients = saveCostInfo(recordDetailsList.get(0).getMedicalRecordId(), patientId);
+        CollectCostPatients collectCostPatients = saveCostInfo(medicalRecordId, patientId);
 
         // 保存患者收费详情
-        BigDecimal receivableCost = saveCollectCostPatientsDetails(collect, collectCostPatients.getId());
+        BigDecimal receivableCost = saveCollectCostPatientsDetails(recordDetailsList, collectCostPatients.getId());
 
         // 更新应收费用
         CollectCostPatients costPatients = new CollectCostPatients();
@@ -101,18 +106,16 @@ public class CollectCostPatientsServiceImpl extends ServiceImpl<CollectCostPatie
     /**
      * 保存患者收费详情
      *
-     * @param collect               病例详情分组
+     * @param recordDetailsList     病例详情分组
      * @param collectCostPatientsId 收费信息ID
      * @return BigDecimal
      */
-    private BigDecimal saveCollectCostPatientsDetails(Map<String, List<MedicalRecordDetails>> collect, String collectCostPatientsId) {
+    private BigDecimal saveCollectCostPatientsDetails(List<MedicalRecordDetails> recordDetailsList, String collectCostPatientsId) {
         BigDecimal receivableCost = new BigDecimal(0);
         List<CollectCostPatientsDetails> collectCostPatientsDetailsList = new ArrayList<>();
-        for (String toothPosition : collect.keySet()) {
-            MedicalRecordDetails medicalRecordDetails = collect.get(toothPosition).get(0);
-
+        for (MedicalRecordDetails medicalRecordDetails : recordDetailsList) {
             DiagnosisTypeCostProjectInfoVO entry = new DiagnosisTypeCostProjectInfoVO();
-            entry.setDiagnosisTypeId(medicalRecordDetails.getDiagnosisTypeId());
+            entry.setDiagnosisTypeId(medicalRecordDetails.getDiagnosisTypeTemplateId());
             List<DiagnosisTypeCostProjectInfoVO> list = diagnosisTypeCostProjectService.findList(entry);
             if (CollectionUtils.isEmpty(list)) {
                 continue;

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/DiagnosisManageServiceImpl.java

@@ -0,0 +1,98 @@
+package com.eitc.patient.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.eitc.common.utils.PatientBaseUtil;
+import com.eitc.common.utils.bean.BeanUtils;
+import com.eitc.patient.domain.DiagnosisManage;
+import com.eitc.patient.excel.DiagnosisManageTemplateExcel;
+import com.eitc.patient.mapper.DiagnosisManageMapper;
+import com.eitc.patient.service.IDiagnosisManageService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * DiagnosisManageServiceImpl
+ *
+ * @author mtx
+ * @date: 2024/05/17 15:39
+ */
+@Service
+public class DiagnosisManageServiceImpl extends ServiceImpl<DiagnosisManageMapper, DiagnosisManage> implements IDiagnosisManageService {
+
+    @Resource
+    private IDiagnosisManageService diagnosisManageService;
+
+    /**
+     * 导入模板数据
+     *
+     * @param list 待导入的诊断管理模板Excel列表
+     * @return 导入失败的诊断管理模板Excel列表，包含错误信息
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public List<DiagnosisManageTemplateExcel> importTemplate(List<DiagnosisManageTemplateExcel> list) {
+        // 用于存储导入成功的诊断管理对象
+        List<DiagnosisManage> successList = new ArrayList<>();
+        // 用于存储导入失败的诊断管理模板Excel对象，保留错误信息
+        List<DiagnosisManageTemplateExcel> errorList = new ArrayList<>();
+
+        // 封装已存在的诊断管理
+        List<DiagnosisManage> manageList = diagnosisManageService.list();
+        List<String> diagnosisCodeList = new ArrayList<>();
+        List<String> diagnosisNameList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(manageList)) {
+            diagnosisCodeList.addAll(manageList.stream().map(DiagnosisManage::getDiagnosisCode).collect(Collectors.toList()));
+            diagnosisNameList.addAll(manageList.stream().map(DiagnosisManage::getDiagnosisName).collect(Collectors.toList()));
+        }
+
+        // 校验数据是否正确
+        for (DiagnosisManageTemplateExcel excel : list) {
+            DiagnosisManage diagnosisManage = new DiagnosisManage();
+            // 检查诊断编码是否为空
+            if (StringUtils.isEmpty(excel.getDiagnosisCode())) {
+                excel.setMsg("诊断编码不能为空");
+                errorList.add(excel);
+                continue;
+            }
+            // 检查诊断编码是否存在
+            if (diagnosisCodeList.contains(excel.getDiagnosisCode())) {
+                excel.setMsg("诊断编码已存在");
+                errorList.add(excel);
+                continue;
+            }
+            // 检查诊断名称是否为空
+            if (StringUtils.isEmpty(excel.getDiagnosisName())) {
+                excel.setMsg("诊断名称不能为空");
+                errorList.add(excel);
+                continue;
+            }
+            // 检查诊断名称是否存在
+            if (diagnosisNameList.contains(excel.getDiagnosisName())) {
+                excel.setMsg("诊断名称已存在");
+                errorList.add(excel);
+                continue;
+            }
+            // 将Excel对象的属性复制到诊断管理对象
+            BeanUtils.copyProperties(excel, diagnosisManage);
+            // 首拼
+            diagnosisManage.setDiagnosisNamePinyinFirstLetter(PatientBaseUtil.getPinYinFirstLetter(diagnosisManage.getDiagnosisName()));
+            diagnosisManage.setDiagnosisNamePinyin(PatientBaseUtil.getPinyin(diagnosisManage.getDiagnosisName()));
+            // 将校验成功的诊断管理对象添加到成功列表
+            successList.add(diagnosisManage);
+        }
+        // 如果有成功导入的数据，则批量保存
+        if (CollectionUtils.isNotEmpty(successList)) {
+            this.saveBatch(successList);
+        }
+        // 返回导入失败的列表，外部可用于显示错误信息
+        return errorList;
+    }
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/DiagnosisTypeCostProjectServiceImpl.java

@@ -70,7 +70,6 @@ public class DiagnosisTypeCostProjectServiceImpl extends ServiceImpl<DiagnosisTy
             if (StringUtils.isBlank(id)) {
                 throw new RuntimeException("收费分类详情ID不能为空");
             }
-
             // 创建诊断类型收费项目对象
             DiagnosisTypeCostProject diagnosisTypeCostProject = new DiagnosisTypeCostProject();
             // 设置诊断类型ID
@@ -84,7 +83,7 @@ public class DiagnosisTypeCostProjectServiceImpl extends ServiceImpl<DiagnosisTy
         }
 
         // 删除原有的同诊断类型ID的诊断类型收费项目
-        this.remove(Wrappers.<DiagnosisTypeCostProject>lambdaQuery().eq(DiagnosisTypeCostProject::getDiagnosisTypeId, diagnosisTypeId));
+//        this.remove(Wrappers.<DiagnosisTypeCostProject>lambdaQuery().eq(DiagnosisTypeCostProject::getDiagnosisTypeId, diagnosisTypeId));
         // 批量保存新的诊断类型收费项目
         this.saveBatch(list);
     }

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/DiagnosisTypeServiceImpl.java

@@ -4,22 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.eitc.common.utils.SecurityUtils;
 import com.eitc.common.utils.bean.BeanUtils;
 import com.eitc.patient.domain.DiagnosisType;
-import com.eitc.patient.dto.DiagnosisTypeOrderDoctorDto;
+import com.eitc.patient.domain.DiagnosisTypeTemplate;
 import com.eitc.patient.mapper.DiagnosisTypeMapper;
-import com.eitc.patient.service.IDiagnosisTypeOrderDoctorService;
 import com.eitc.patient.service.IDiagnosisTypeService;
+import com.eitc.patient.service.IDiagnosisTypeTemplateService;
 import com.eitc.patient.tree.DiagnosisTypeTree;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -33,7 +30,7 @@ import java.util.stream.Collectors;
 public class DiagnosisTypeServiceImpl extends ServiceImpl<DiagnosisTypeMapper, DiagnosisType> implements IDiagnosisTypeService {
 
     @Resource
-    private IDiagnosisTypeOrderDoctorService diagnosisTypeOrderDoctorService;
+    private IDiagnosisTypeTemplateService diagnosisTypeTemplateService;
 
     /**
      * 获取面包屑
@@ -69,8 +66,12 @@ public class DiagnosisTypeServiceImpl extends ServiceImpl<DiagnosisTypeMapper, D
     @Override
     public List<DiagnosisType> getDiagnosisTypes(DiagnosisType diagnosisType) {
         LambdaQueryWrapper<DiagnosisType> eq = Wrappers.<DiagnosisType>lambdaQuery()
-                .eq(StringUtils.isNotBlank(diagnosisType.getDiagnosisName()), DiagnosisType::getDiagnosisName, diagnosisType.getDiagnosisName())
-                .orderByDesc(DiagnosisType::getDiagnosisName);
+                .like(StringUtils.isNotBlank(diagnosisType.getDiagnosisName()), DiagnosisType::getDiagnosisName, diagnosisType.getDiagnosisName()).or()
+                .like(StringUtils.isNotBlank(diagnosisType.getDiagnosisNamePinyinFirstLetter()),
+                        DiagnosisType::getDiagnosisNamePinyinFirstLetter, diagnosisType.getDiagnosisNamePinyinFirstLetter()).or()
+                .like(StringUtils.isNotBlank(diagnosisType.getDiagnosisNamePinyin()),
+                        DiagnosisType::getDiagnosisNamePinyin, diagnosisType.getDiagnosisNamePinyin())
+                .orderByDesc(DiagnosisType::getCreateDate);
 
         return this.list(eq);
     }
@@ -90,75 +91,81 @@ public class DiagnosisTypeServiceImpl extends ServiceImpl<DiagnosisTypeMapper, D
     }
 
     /**
-     * 根据医生ID查找诊断类型树形列表。
-     * 该方法主要用于获取与医生相关的诊断类型树，用于前端展示或筛选。
-     * 如果医生没有关联的诊断类型，则返回所有的诊断类型树。
+     * 获取树形结构
      *
-     * @return 树形结构列表，包含诊断类型信息。
+     * @param searchParam 搜索信息
+     * @param visitType   状态
+     * @return 返回结果
+     * @author mtx
+     * @date: 2024/8/21 9:36
      */
     @Override
-    public List<DiagnosisTypeTree> findTreeList() {
-        // 根据当前登录用户的ID查找与其关联的诊断类型订单
-        List<DiagnosisTypeOrderDoctorDto> dtoList = diagnosisTypeOrderDoctorService.findListByDoctorId(String.valueOf(SecurityUtils.getUserId()));
-        // 用于存储诊断类型ID和对应的诊断类型ID的映射
-        Map<String, String> map = new HashMap<>();
-        // 初始化诊断类型列表
-        List<DiagnosisType> list = new ArrayList<>();
-
-        // 如果关联的诊断类型订单列表为空，则直接获取所有的诊断类型
-        if (CollectionUtils.isEmpty(dtoList)) {
-            list = this.getDiagnosisTypes(new DiagnosisType());
-        } else {
-            // 遍历关联的诊断类型订单，转换为诊断类型对象，并存储映射关系
-            for (DiagnosisTypeOrderDoctorDto dto : dtoList) {
-                DiagnosisType dt = new DiagnosisType();
-                BeanUtils.copyProperties(dto, dt);
-                map.put(dto.getId(), dto.getDiagnosisTypeId());
-                list.add(dt);
+    public List<DiagnosisTypeTree> findTreeList(String searchParam, String visitType) {
+        // 获取分类列表
+        List<DiagnosisType> list = this.getDiagnosisTypes(new DiagnosisType());
+        // 封装树形结构
+        List<DiagnosisTypeTree> treeBeans = new ArrayList<>();
+        // 获取数据列表
+        LambdaQueryWrapper<DiagnosisTypeTemplate> wrapper = Wrappers.lambdaQuery();
+        if (StringUtils.isNotBlank(searchParam)) {
+            wrapper.and(w -> w.like(DiagnosisTypeTemplate::getTemplateName, searchParam).or()
+                    .like(DiagnosisTypeTemplate::getNamePinyinFirstLetter, searchParam).or()
+                    .like(DiagnosisTypeTemplate::getNamePinyin, searchParam));
+        }
+        if (StringUtils.isNotBlank(visitType)) {
+            wrapper.eq(DiagnosisTypeTemplate::getVisitType, visitType);
+        }
+        wrapper.eq(DiagnosisTypeTemplate::getEnableStatus, 1);
+        List<DiagnosisTypeTemplate> templates = diagnosisTypeTemplateService.list(wrapper);
+        if (CollectionUtils.isNotEmpty(templates)) {
+            for (DiagnosisTypeTemplate template : templates) {
+                DiagnosisTypeTree diagnosisTypeTree = new DiagnosisTypeTree();
+                diagnosisTypeTree.setDiagnosisName(template.getTemplateName());
+                diagnosisTypeTree.setTemplateDesc(template.getTemplateDesc());
+                diagnosisTypeTree.setDiagnosisNamePinyin(template.getNamePinyin());
+                diagnosisTypeTree.setDiagnosisNamePinyinFirstLetter(template.getNamePinyinFirstLetter());
+                diagnosisTypeTree.setVisitType(template.getVisitType());
+                diagnosisTypeTree.setParentId(template.getDiagnosisTypeId());
+                diagnosisTypeTree.setId(template.getId());
+                diagnosisTypeTree.setDiagnosisManageId(template.getDiagnosisManageId());
+
+                treeBeans.add(diagnosisTypeTree);
             }
         }
 
-        // 将诊断类型列表转换为树形结构列表
-        List<DiagnosisTypeTree> treeBeans = new ArrayList<>();
         list.forEach(t -> {
             DiagnosisTypeTree diagnosisTypeTree = new DiagnosisTypeTree();
             BeanUtils.copyProperties(t, diagnosisTypeTree);
             treeBeans.add(diagnosisTypeTree);
         });
 
-        // 获取树形结构中的根节点
-        List<DiagnosisTypeTree> children = this.getChildren("0", treeBeans);
-        // 将映射关系中的诊断类型ID设置到树形结构中，用于后续的关联操作
-        setTreeIdToDiagnosisTypeId(children, map);
-
-        return children;
+        //获取父节点
+        return this.getChildren("0", treeBeans);
     }
 
-
     /**
-     * 将诊断类型树的ID设置为诊断类型ID的映射值。
-     * 此方法递归处理一个诊断类型树列表，将每个节点的ID替换为映射表中对应的值。
-     * 这样做的目的是为了更新树结构中节点的ID，确保ID的唯一性和一致性。
+     * 检查是否可以添加诊断类型
+     * 此方法主要进行两个重要检查：
+     * 1. 确保传入的诊断类型ID不为空，因为这是添加新诊断类型的必要条件
+     * 2. 检查传入的诊断类型ID是否已经有子类型存在，如果存在子类型，则不允许添加新的诊断类型
      *
-     * @param list 诊断类型树列表，包含待处理的树结构。
-     * @param map  用于映射旧ID到新ID的映射表，提供ID的替换规则。
+     * @param diagnosisTypeId 诊断类型ID，用于检查和添加新的诊断类型
+     * @throws IllegalArgumentException 如果诊断类型ID为空或存在子类型，则抛出此异常
      */
-    public void setTreeIdToDiagnosisTypeId(List<DiagnosisTypeTree> list, Map<String, String> map) {
-        // 检查列表是否为空，如果为空则直接返回，无需处理。
-        if (CollectionUtils.isEmpty(list)) {
-            return;
+    @Override
+    public void checkAddDiagnosisType(String diagnosisTypeId) {
+        // 检查诊断类型ID是否为空
+        if (StringUtils.isBlank(diagnosisTypeId)) {
+            throw new IllegalArgumentException("必填项不能为空");
         }
-        // 遍历列表中的每个诊断类型树节点。
-        for (DiagnosisTypeTree diagnosisTypeTree : list) {
-            // 递归处理当前节点的子节点列表，确保树结构的所有节点都被处理。
-            List<DiagnosisTypeTree> childrenList = diagnosisTypeTree.getChildrenList();
-            setTreeIdToDiagnosisTypeId(childrenList, map);
-            // 使用映射表中旧ID对应的 新ID 更新当前节点的ID。
-            if (StringUtils.isNotBlank(map.get(diagnosisTypeTree.getId()))) {
-                diagnosisTypeTree.setId(map.get(diagnosisTypeTree.getId()));
-            }
+
+        // 查询是否有子类型存在
+        long typeCount = this.count(Wrappers.<DiagnosisType>lambdaQuery().eq(DiagnosisType::getParentId, diagnosisTypeId));
+
+        // 如果存在子类型，则不允许添加模板
+        if (typeCount > 0) {
+            throw new IllegalArgumentException("存在子类型，不允许添加模板");
         }
     }
 
-
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/DiagnosisTypeTemplateServiceImpl.java

@@ -1,32 +1,35 @@
 package com.eitc.patient.service.impl;
 
+import cn.hutool.core.lang.UUID;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.eitc.common.utils.poi.ExcelUtil;
+import com.eitc.common.core.domain.entity.SysDept;
+import com.eitc.common.utils.PatientBaseUtil;
+import com.eitc.common.utils.bean.BeanUtils;
 import com.eitc.patient.constant.PatientConstant;
+import com.eitc.patient.domain.DiagnosisManage;
+import com.eitc.patient.domain.DiagnosisType;
 import com.eitc.patient.domain.DiagnosisTypeTemplate;
-import com.eitc.patient.enums.DiagnosisTypeTemplateReviewStatusEnum;
 import com.eitc.patient.excel.DiagnosisTypeTemplateExcel;
 import com.eitc.patient.mapper.DiagnosisTypeTemplateMapper;
+import com.eitc.patient.service.IDiagnosisManageService;
+import com.eitc.patient.service.IDiagnosisTypeService;
 import com.eitc.patient.service.IDiagnosisTypeTemplateService;
-import com.eitc.patient.utils.PatientUtil;
 import com.eitc.patient.vo.DiagnosisTypeTemplateSaveVO;
-import com.eitc.patient.vo.DiagnosisTypeTemplateVO;
-import com.eitc.system.service.ISysDictDataService;
+import com.eitc.system.service.ISysDeptService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -41,66 +44,126 @@ import java.util.stream.Collectors;
 public class DiagnosisTypeTemplateServiceImpl extends ServiceImpl<DiagnosisTypeTemplateMapper, DiagnosisTypeTemplate> implements IDiagnosisTypeTemplateService {
 
     @Resource
-    private ISysDictDataService sysDictDataService;
+    private ISysDeptService sysDeptService;
+    @Resource
+    private IDiagnosisTypeService diagnosisTypeService;
+    @Resource
+    private IDiagnosisManageService diagnosisManageService;
 
 
     /**
-     * 获取模板选项的json串
+     * 根据提供的模板示例字符串，查找并生成模板选项的JSON表示
      *
-     * @param templateExample 要获取json串的示例
+     * @param jsonContent 要获取json串的示例
      * @return json串
      * @author mtx
      * @date: 2024/5/20 14:50
      */
     @Override
-    public String findTemplateOptionJson(String templateExample) {
-        JSONObject templateOption = new JSONObject();
-        if (StringUtils.isNotBlank(templateExample)) {
-            Matcher matcher = PatientConstant.COMPILE.matcher(templateExample);
-            int num = 1;
-            // 牙{发黑、有洞、龋洞} {1、2、3、6} 个月  将{}里的内容存到json串里
-            // 将《牙{发黑、有洞、龋洞} {1、2、3、6} 个月》转换成 {"patient_diagnosisTypeTemplate_1":["发黑","有洞","龋洞"],"patient_diagnosisTypeTemplate_2":["1","2","3","6"]}
+    public String findTemplateInfo(String jsonContent) {
+        JSONObject json = new JSONObject();
+        JSONObject dicData = new JSONObject();
+        List<String> keyList = new ArrayList<>();
+        StringBuilder sb = new StringBuilder();
+        // 拆分传过来的字符串，将字符串里的选项存到json里，并且根据第一个选项生成字符串
+        if (StringUtils.isNotBlank(jsonContent)) {
+            Matcher matcher = PatientConstant.COMPILE.matcher(jsonContent);
             while (matcher.find()) {
-                String group = matcher.group(1);
-                String[] split = group.split("、");
-                templateOption.put(PatientConstant.DIAGNOSIS_TYPE_TEMPLATE_KEY_PREFIX + num, split);
-                num++;
+                String replacement = "_" + UUID.randomUUID().toString().replaceAll("-", "");
+                keyList.add(replacement);
+                // 获取内容
+                String content = matcher.group(0);
+                jsonContent = Pattern.compile(content, Pattern.LITERAL).matcher(jsonContent).replaceFirst(Matcher.quoteReplacement(replacement));
+
+                // 获取选项
+                String option = matcher.group(1);
+                dicData.put(replacement, option.split("、"));
             }
         }
-        return templateOption.toJSONString();
+        // 将传过来的走传进行拆分
+        JSONArray str = getJsonContent(jsonContent, dicData, sb, keyList);
+        json.put("dic_data", dicData);
+        json.put("text", sb.toString());
+        json.put("str", str);
+        return json.toJSONString();
     }
 
     /**
-     * 获取模板数据中{}中的数据
+     * 将给定的字符串根据关键字列表拆分成JSON数组
+     * 如果字符串为空，则返回包含空值的单个JSON对象的数组
+     * 如果没有关键字，则直接返回包含原始字符串的单个JSON对象的数组
+     * 否则，根据关键字将字符串拆分，并将拆分部分及其在字典数据中的对应选项（如果存在）转换为JSON对象，然后添加到数组中
      *
-     * @param templateExample 要获取json串的示例
-     * @return json串
-     * @author mtx
-     * @date: 2024/5/20 14:50
+     * @param content 待处理的字符串
+     * @param dicData 字典数据，包含关键字及其选项
+     * @param sb 用于累加处理过程中的字符串
+     * @param keyList 关键字列表，用于拆分字符串
+     * @return 包含拆分字符串部分及其选项（如果存在）的JSON对象的数组
      */
-    @Override
-    public String findTemplateInfo(String templateExample) {
-        if (StringUtils.isEmpty(templateExample)) {
-            return "";
+    public JSONArray getJsonContent(String content, JSONObject dicData, StringBuilder sb, List<String> keyList) {
+        JSONArray array = new JSONArray();
+        JSONObject json;
+        // 如果字符串为空，则直接返回空
+        if (StringUtils.isBlank(content)){
+            json = new JSONObject();
+            json.put("type", "string");
+            json.put("value", "");
+            array.add(json);
+            return array;
+        }
+        // 如果是字符串，没有选项，则直接返回字符串
+        if (CollectionUtils.isEmpty(keyList)){
+            sb.append(content);
+            json = new JSONObject();
+            json.put("type", "string");
+            json.put("value", content);
+            array.add(json);
+            return array;
         }
-        // 将《牙{发黑、有洞、龋洞} {1、2、3、6} 个月》转换成 牙patient_diagnosisTypeTemplate_1 patient_diagnosisTypeTemplate_2 个月
-        Matcher matcher = PatientConstant.COMPILE.matcher(templateExample);
-        int num = 1;
-        while (matcher.find()) {
-            String oldStr = templateExample;
-            String target = matcher.group(0);
-            String replacement = PatientConstant.DIAGNOSIS_TYPE_TEMPLATE_KEY_PREFIX + num;
-
-            templateExample = Pattern.compile(target, Pattern.LITERAL).matcher(oldStr).replaceFirst(Matcher.quoteReplacement(replacement));
-            num++;
+        // 其他的拆分成json
+        String jsonContent = content;
+        for (int i = 0; i < keyList.size(); i++) {
+            String key = keyList.get(i);
+            String[] split = jsonContent.split(key);
+            String str0 = split[0];
+            if (StringUtils.isNotBlank(str0)) {
+                sb.append(str0);
+                json = new JSONObject();
+                json.put("type", "string");
+                json.put("value", str0);
+                array.add(json);
+            }
+
+            JSONArray jsonArray = dicData.getJSONArray(key);
+            if (Objects.nonNull(jsonArray)) {
+                sb.append(jsonArray.get(0));
+                json = new JSONObject();
+                json.put("type", "select");
+                json.put("val", jsonArray.get(0));
+                json.put("value", key);
+                array.add(json);
+            }
+            if(split.length<2){
+                continue;
+            }
+
+            String str1 = split[1];
+            if (StringUtils.isNotBlank(str1) && i == keyList.size() - 1) {
+                sb.append(str1);
+                json = new JSONObject();
+                json.put("type", "string");
+                json.put("value", str1);
+                array.add(json);
+            }
+            jsonContent = str1;
         }
-        return templateExample;
+        return array;
     }
 
     /**
      * 导入诊断分类模板
      *
-     * @param file            文件
+     * @param list            列表
      * @param diagnosisTypeId 诊断分类id
      * @return AjaxResult
      * @author mtx
@@ -108,103 +171,335 @@ public class DiagnosisTypeTemplateServiceImpl extends ServiceImpl<DiagnosisTypeT
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public List<DiagnosisTypeTemplateExcel> importTemplate(MultipartFile file, String diagnosisTypeId) throws IOException {
-        boolean b = true;
-        List<DiagnosisTypeTemplate> diagnosisTypeTemplateList = new ArrayList<>();
-        List<DiagnosisTypeTemplateExcel> list;
-
-        // 1.解析excel
-        ExcelUtil<DiagnosisTypeTemplateExcel> util = new ExcelUtil<>(DiagnosisTypeTemplateExcel.class);
-        list = util.importExcel(file.getInputStream());
-        // 2.如果解析数据为空则返回错误信息
-        if (CollectionUtils.isEmpty(list)) {
-            throw new RuntimeException("上传数据为空，请填写");
+    public List<DiagnosisTypeTemplateExcel> importTemplate(List<DiagnosisTypeTemplateExcel> list, String diagnosisTypeId) {
+        // 用于存储导入成功的诊断管理对象
+        List<DiagnosisTypeTemplate> successList = new ArrayList<>();
+        // 用于存储导入失败的诊断管理模板Excel对象，保留错误信息
+        List<DiagnosisTypeTemplateExcel> errorList = new ArrayList<>();
+
+        // 封装已存在的诊断管理
+        List<DiagnosisManage> manageList = diagnosisManageService.list();
+        Map<String, String> diagnosisCodeMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(manageList)) {
+            diagnosisCodeMap = manageList.stream().collect(Collectors.toMap(DiagnosisManage::getId, DiagnosisManage::getDiagnosisName));
         }
-        AtomicInteger num = new AtomicInteger(1);
+
         // 3.校验数据是否正确
         for (DiagnosisTypeTemplateExcel excel : list) {
+            DiagnosisTypeTemplate template = new DiagnosisTypeTemplate();
+
+            // 诊断分类
+            try {
+                checkClassify(excel, template);
+            } catch (IllegalArgumentException e) {
+                excel.setMsg(e.getMessage());
+                errorList.add(excel);
+                continue;
+            }
+
+            // 模板名称
             if (StringUtils.isEmpty(excel.getTemplateName())) {
                 excel.setMsg("模板名称不能为空");
-                b = false;
+                errorList.add(excel);
                 continue;
             }
+            template.setTemplateName(excel.getTemplateName());
 
-            String typeTemplateName = sysDictDataService.selectDictLabel(PatientConstant.DICT_KEY_DIAGNOSIS_TYPE_TEMPLATE_NAME, excel.getTemplateName());
-            if (StringUtils.isEmpty(typeTemplateName)) {
-                excel.setMsg("模板名称错误");
-                b = false;
+            // 诊断名称
+            if (StringUtils.isEmpty(excel.getDiagnosisManageName())) {
+                excel.setMsg("诊断名称不能为空");
+                errorList.add(excel);
                 continue;
             }
+            if (!diagnosisCodeMap.containsValue(excel.getDiagnosisManageName())) {
+                excel.setMsg("诊断名称不存在");
+                errorList.add(excel);
+                continue;
+            }
+            for (String id : diagnosisCodeMap.keySet()) {
+                if (!diagnosisCodeMap.get(id).equals(excel.getDiagnosisManageName())) {
+                    continue;
+                }
+                template.setDiagnosisManageId(id);
+                template.setDiagnosisManageName(excel.getDiagnosisManageName());
+            }
 
-            if (StringUtils.isEmpty(excel.getTemplateExample())) {
-                excel.setMsg("模板示例不能为空");
-                b = false;
+            // 模板描述
+            if (StringUtils.isEmpty(excel.getTemplateDesc())) {
+                excel.setMsg("模板描述不能为空");
+                errorList.add(excel);
+                continue;
             }
-        }
-        for (String s : PatientUtil.diagnosisTypeTemplateKeyList()) {
-            Optional<DiagnosisTypeTemplateExcel> first = list.stream().filter(li -> s.equals(li.getTemplateName())).findFirst();
-            if (first.isPresent()) {
-                DiagnosisTypeTemplateExcel excel = first.get();
-                DiagnosisTypeTemplate diagnosisTypeTemplate = new DiagnosisTypeTemplate();
-                // 牙{发黑、有洞、龋洞} {1、2、3、6} 个月
-                diagnosisTypeTemplate.setTemplateName(excel.getTemplateName());
-                String templateExample = excel.getTemplateExample();
-                if (StringUtils.isNotEmpty(templateExample)) {
-                    diagnosisTypeTemplate.setTemplateExample(templateExample);
-                    diagnosisTypeTemplate.setTemplateOption(this.findTemplateOptionJson(templateExample));
-                    diagnosisTypeTemplate.setTemplateInfo(this.findTemplateInfo(templateExample));
+            template.setTemplateDesc(excel.getTemplateDesc());
+
+            // 适用科室
+            String applyDept = excel.getApplyDept();
+            if (StringUtils.isEmpty(applyDept)) {
+                excel.setMsg("适用科室不能为空");
+                errorList.add(excel);
+                continue;
+            }
+            List<Long> deptList = new ArrayList<>();
+            try {
+                String[] split = applyDept.split(",");
+                for (String deptName : split) {
+                    SysDept sd = new SysDept();
+                    sd.setDeptName(deptName);
+                    List<SysDept> sysDepts = sysDeptService.selectDeptList(sd);
+                    if (CollectionUtils.isNotEmpty(sysDepts)) {
+                        deptList.add(sysDepts.get(0).getDeptId());
+                    } else {
+                        throw new IllegalArgumentException("适用科室不存在");
+                    }
                 }
-                diagnosisTypeTemplate.setReviewStatus(DiagnosisTypeTemplateReviewStatusEnum.ALREADY_AUDITING.getCode());
-                diagnosisTypeTemplate.setDiagnosisTypeId(diagnosisTypeId);
-                diagnosisTypeTemplate.setOrderNum(num.getAndIncrement());
-                diagnosisTypeTemplateList.add(diagnosisTypeTemplate);
+            } catch (IllegalArgumentException e) {
+                excel.setMsg(e.getMessage());
+                errorList.add(excel);
+                continue;
+            }
+            template.setApplyDept(StringUtils.join(deptList, ","));
+
+            // 就诊类型
+            if (StringUtils.isEmpty(excel.getVisitType())) {
+                excel.setMsg("就诊类型不能为空");
+                errorList.add(excel);
+                continue;
+            }
+            if ("初诊".equals(excel.getVisitType()) || "复诊".equals(excel.getVisitType())) {
+                template.setVisitType("初诊".equals(excel.getVisitType()) ? 1 : 2);
             } else {
-                throw new RuntimeException("模板错误");
+                excel.setMsg("就诊类型错误");
+                errorList.add(excel);
+                continue;
             }
-        }
 
-        if (b && CollectionUtils.isNotEmpty(diagnosisTypeTemplateList)) {
-            // 4.删除历史数据
-            this.remove(Wrappers.<DiagnosisTypeTemplate>lambdaQuery().eq(DiagnosisTypeTemplate::getDiagnosisTypeId, diagnosisTypeId));
-            // 5.保存数据并返回
-            this.saveBatch(diagnosisTypeTemplateList);
+            // 主诉
+            if (StringUtils.isEmpty(excel.getChiefComplaintContent())) {
+                excel.setMsg("主诉不能为空");
+                errorList.add(excel);
+                continue;
+            }
+            template.setChiefComplaintContent(excel.getChiefComplaintContent());
+
+            // 现病史
+            if (template.getVisitType() == 1 && StringUtils.isBlank(excel.getPresentIllnessContent())) {
+                throw new IllegalArgumentException("初诊必须填写现病史");
+            }
+            template.setPresentIllnessContent(excel.getPresentIllnessContent());
+
+            // 检查
+            if (StringUtils.isEmpty(excel.getInspectContent())) {
+                excel.setMsg("检查不能为空");
+                errorList.add(excel);
+                continue;
+            }
+            template.setInspectContent(excel.getInspectContent());
+
+            // 治疗计划
+            if (StringUtils.isEmpty(excel.getTreatmentPlanningContent())) {
+                excel.setMsg("治疗计划不能为空");
+                errorList.add(excel);
+                continue;
+            }
+            template.setTreatmentPlanningContent(excel.getTreatmentPlanningContent());
+
+            // 处置
+            if (StringUtils.isEmpty(excel.getDisposeContent())) {
+                excel.setMsg("处置不能为空");
+                errorList.add(excel);
+                continue;
+            }
+            template.setDisposeContent(excel.getDisposeContent());
+
+            // 便签
+            if (StringUtils.isNotBlank(excel.getNoteContent())) {
+                template.setNoteContent(excel.getNoteContent());
+            }
+
+            // 设置主诉选项
+            saveDiagnosisOption(template);
+            // 默认未启用
+            template.setEnableStatus(0);
+
+            successList.add(template);
         }
+        // 保存数据并返回
+        if (CollectionUtils.isNotEmpty(successList)) {
+            this.saveBatch(successList);
+        }
+        // 返回导入失败的列表，外部可用于显示错误信息
+        return errorList;
+    }
 
-        return b ? Collections.emptyList() : list;
+    private void checkClassify(DiagnosisTypeTemplateExcel excel, DiagnosisTypeTemplate template) {
+        if (StringUtils.isNotBlank(excel.getClassifyOne())) {
+            List<DiagnosisType> list1 = diagnosisTypeService.list(Wrappers.<DiagnosisType>lambdaQuery()
+                    .eq(DiagnosisType::getParentId, "0")
+                    .eq(DiagnosisType::getDiagnosisName, excel.getClassifyOne()));
+            if (CollectionUtils.isNotEmpty(list1)) {
+                if (StringUtils.isNotBlank(excel.getClassifyTwo())) {
+                    List<DiagnosisType> list2 = diagnosisTypeService.list(Wrappers.<DiagnosisType>lambdaQuery()
+                            .eq(DiagnosisType::getParentId, list1.get(0).getId())
+                            .eq(DiagnosisType::getDiagnosisName, excel.getClassifyTwo()));
+                    if (CollectionUtils.isNotEmpty(list2)) {
+                        if (StringUtils.isNotBlank(excel.getClassifyThree())) {
+                            List<DiagnosisType> list3 = diagnosisTypeService.list(Wrappers.<DiagnosisType>lambdaQuery()
+                                    .eq(DiagnosisType::getParentId, list2.get(0).getId())
+                                    .eq(DiagnosisType::getDiagnosisName, excel.getClassifyThree()));
+                            if (CollectionUtils.isNotEmpty(list3)) {
+                                if (StringUtils.isNotBlank(excel.getClassifyFour())) {
+                                    List<DiagnosisType> list4 = diagnosisTypeService.list(Wrappers.<DiagnosisType>lambdaQuery()
+                                            .eq(DiagnosisType::getParentId, list3.get(0).getId())
+                                            .eq(DiagnosisType::getDiagnosisName, excel.getClassifyFour()));
+                                    if (CollectionUtils.isNotEmpty(list4)) {
+                                        if (StringUtils.isNotBlank(excel.getClassifyFive())) {
+                                            List<DiagnosisType> list5 = diagnosisTypeService.list(Wrappers.<DiagnosisType>lambdaQuery()
+                                                    .eq(DiagnosisType::getParentId, list4.get(0).getId())
+                                                    .eq(DiagnosisType::getDiagnosisName, excel.getClassifyFive()));
+                                            if (CollectionUtils.isNotEmpty(list5)) {
+                                                if (StringUtils.isNotBlank(excel.getClassifySix())) {
+                                                    List<DiagnosisType> list6 = diagnosisTypeService.list(Wrappers.<DiagnosisType>lambdaQuery()
+                                                            .eq(DiagnosisType::getParentId, list5.get(0).getId())
+                                                            .eq(DiagnosisType::getDiagnosisName, excel.getClassifySix()));
+                                                    if (CollectionUtils.isNotEmpty(list6)) {
+                                                        // 校验是否可以添加模板
+                                                        diagnosisTypeService.checkAddDiagnosisType(list6.get(0).getId());
+                                                        template.setDiagnosisTypeId(list6.get(0).getId());
+                                                    } else {
+                                                        throw new IllegalArgumentException("六级分类不存在");
+                                                    }
+                                                } else {
+                                                    // 校验是否可以添加模板
+                                                    diagnosisTypeService.checkAddDiagnosisType(list5.get(0).getId());
+                                                    template.setDiagnosisTypeId(list5.get(0).getId());
+                                                }
+                                            } else {
+                                                throw new IllegalArgumentException("五级分类不存在");
+                                            }
+                                        } else {
+                                            // 校验是否可以添加模板
+                                            diagnosisTypeService.checkAddDiagnosisType(list4.get(0).getId());
+                                            template.setDiagnosisTypeId(list4.get(0).getId());
+                                        }
+                                    } else {
+                                        throw new IllegalArgumentException("四级分类不存在");
+                                    }
+                                } else {
+                                    // 校验是否可以添加模板
+                                    diagnosisTypeService.checkAddDiagnosisType(list3.get(0).getId());
+                                    template.setDiagnosisTypeId(list3.get(0).getId());
+                                }
+                            } else {
+                                throw new IllegalArgumentException("三级分类不存在");
+                            }
+                        } else {
+                            // 校验是否可以添加模板
+                            diagnosisTypeService.checkAddDiagnosisType(list2.get(0).getId());
+                            template.setDiagnosisTypeId(list2.get(0).getId());
+                        }
+                    } else {
+                        throw new IllegalArgumentException("二级分类不存在");
+                    }
+                } else {
+                    // 校验是否可以添加模板
+                    diagnosisTypeService.checkAddDiagnosisType(list1.get(0).getId());
+                    template.setDiagnosisTypeId(list1.get(0).getId());
+                }
+            } else {
+                throw new IllegalArgumentException("一级分类不存在");
+            }
+        } else {
+            throw new IllegalArgumentException("一级分类不能为空");
+        }
     }
 
     /**
      * 新增或修改诊断模板
      *
      * @param entry 参数
-     * @return 返回值
      * @author mtx
      * @date: 2024/6/7 14:06
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public boolean add(DiagnosisTypeTemplateSaveVO entry) {
-        String diagnosisTypeId = entry.getDiagnosisTypeId();
-        List<DiagnosisTypeTemplateVO> diagnosisTypeTemplateList = entry.getDiagnosisTypeTemplateList();
-        AtomicInteger num = new AtomicInteger(1);
-        // 封装诊断模板数据
-        List<DiagnosisTypeTemplate> collect = diagnosisTypeTemplateList.stream().map(typeTemplateVO -> {
-            // 封装模板数据
-            DiagnosisTypeTemplate diagnosisTypeTemplate = new DiagnosisTypeTemplate();
-            String templateExample = typeTemplateVO.getTemplateExample();
-            if (StringUtils.isNotBlank(templateExample)) {
-                diagnosisTypeTemplate.setTemplateOption(this.findTemplateOptionJson(templateExample));
-                diagnosisTypeTemplate.setTemplateInfo(this.findTemplateInfo(templateExample));
-                diagnosisTypeTemplate.setTemplateExample(templateExample);
-            }
-            diagnosisTypeTemplate.setReviewStatus(DiagnosisTypeTemplateReviewStatusEnum.ALREADY_AUDITING.getCode());
-            diagnosisTypeTemplate.setTemplateName(typeTemplateVO.getTemplateName());
-            diagnosisTypeTemplate.setDiagnosisTypeId(diagnosisTypeId);
-            diagnosisTypeTemplate.setOrderNum(num.getAndIncrement());
-            return diagnosisTypeTemplate;
-        }).collect(Collectors.toList());
-
-        return this.saveBatch(collect);
+    public void add(DiagnosisTypeTemplateSaveVO entry) {
+        // 校验是否可以添加模板
+        diagnosisTypeService.checkAddDiagnosisType(entry.getDiagnosisTypeId());
+        this.save(getDiagnosisTypeTemplate(entry));
+    }
+
+    /**
+     * 修改诊断模板
+     *
+     * @param entry 参数
+     * @author mtx
+     * @date: 2024/6/7 14:06
+     */
+    @Override
+    public void edit(DiagnosisTypeTemplateSaveVO entry) {
+        if (StringUtils.isEmpty(entry.getId())) {
+            throw new IllegalArgumentException("id不能为空");
+        }
+        this.updateById(getDiagnosisTypeTemplate(entry));
+    }
+
+    /**
+     * 根据提供的诊断类型模板保存视图对象，构建并返回一个新的 DiagnosisTypeTemplate 实例
+     * 该方法主要用于处理诊断类型模板的保存逻辑，其中包括复制视图对象属性、验证诊断管理ID、
+     * 设置诊断管理名称以及处理适用部门列表
+     *
+     * @param entry 诊断类型模板保存视图对象，用于接收前端传入的诊断类型模板信息
+     * @return 返回构建好的 DiagnosisTypeTemplate 实例
+     */
+    private DiagnosisTypeTemplate getDiagnosisTypeTemplate(DiagnosisTypeTemplateSaveVO entry) {
+        if (entry.getVisitType() == 1 && StringUtils.isBlank(entry.getPresentIllnessContent())) {
+            throw new IllegalArgumentException("初诊必须填写现病史");
+        }
+
+        // 初始化 DiagnosisTypeTemplate 实例
+        DiagnosisTypeTemplate diagnosisTypeTemplate = new DiagnosisTypeTemplate();
+        // 将视图对象的属性复制到 DiagnosisTypeTemplate 实例中
+        BeanUtils.copyProperties(entry, diagnosisTypeTemplate);
+        // 根据提供的ID获取诊断管理实体
+        DiagnosisManage manage = diagnosisManageService.getById(entry.getDiagnosisManageId());
+        // 若诊断管理ID不存在，则抛出参数异常
+        if (Objects.isNull(manage)) {
+            throw new IllegalArgumentException("诊断管理id不存在");
+        }
+        // 设置 DiagnosisTypeTemplate 的诊断管理名称
+        diagnosisTypeTemplate.setDiagnosisManageName(manage.getDiagnosisName());
+        // 获取适用部门列表
+        List<Long> applyDeptList = entry.getApplyDeptList();
+        // 若适用部门列表不为空，则将其转换为以逗号分隔的字符串，并设置到 DiagnosisTypeTemplate 中
+        if (CollectionUtils.isEmpty(applyDeptList)) {
+            throw new IllegalArgumentException("适用科室不能为空");
+        }
+        diagnosisTypeTemplate.setApplyDept(StringUtils.join(applyDeptList, ","));
+        // 设置主诉选项
+        saveDiagnosisOption(diagnosisTypeTemplate);
+
+        // 返回构建好的 DiagnosisTypeTemplate 实例
+        return diagnosisTypeTemplate;
+    }
+
+    /**
+     * 保存诊断选项
+     * 此方法用于将诊断类型模板中的诊断内容设置到相应的选项中
+     * 它通过将各个诊断部分的内容赋值给模板的相应选项，来简化诊断信息的管理和使用
+     *
+     * @param diagnosisTypeTemplate 诊断类型模板，包含各种诊断内容和对应的选项
+     */
+    private void saveDiagnosisOption(DiagnosisTypeTemplate diagnosisTypeTemplate) {
+        // 首拼
+        diagnosisTypeTemplate.setNamePinyinFirstLetter(PatientBaseUtil.getPinYinFirstLetter(diagnosisTypeTemplate.getTemplateName()));
+        diagnosisTypeTemplate.setNamePinyin(PatientBaseUtil.getPinyin(diagnosisTypeTemplate.getTemplateName()));
+
+        diagnosisTypeTemplate.setChiefComplaintOption(this.findTemplateInfo(diagnosisTypeTemplate.getChiefComplaintContent()));
+        diagnosisTypeTemplate.setPresentIllnessOption(this.findTemplateInfo(diagnosisTypeTemplate.getPresentIllnessContent()));
+        diagnosisTypeTemplate.setInspectOption(this.findTemplateInfo(diagnosisTypeTemplate.getInspectContent()));
+        diagnosisTypeTemplate.setTreatmentPlanningOption(this.findTemplateInfo(diagnosisTypeTemplate.getTreatmentPlanningContent()));
+        diagnosisTypeTemplate.setDisposeOption(this.findTemplateInfo(diagnosisTypeTemplate.getDisposeContent()));
+        diagnosisTypeTemplate.setNoteOption(this.findTemplateInfo(diagnosisTypeTemplate.getNoteContent()));
     }
 
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/ImageRecordServiceImpl.java

@@ -0,0 +1,17 @@
+package com.eitc.patient.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.eitc.patient.domain.ImageRecord;
+import com.eitc.patient.mapper.ImageRecordMapper;
+import com.eitc.patient.service.IImageRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * ImageRecordServiceImpl
+ *
+ * @author mtx
+ * @date: 2024/06/11 17:37
+ */
+@Service
+public class ImageRecordServiceImpl extends ServiceImpl<ImageRecordMapper, ImageRecord> implements IImageRecordService {
+}

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/MedicalHistoryServiceImpl.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.eitc.patient.domain.MedicalHistory;
-import com.eitc.patient.dto.DiagnosisTypeTemplateDto;
 import com.eitc.patient.enums.MedicalHistoryDiseaseSourceEnum;
 import com.eitc.patient.enums.MedicalHistoryDiseaseTypeEnum;
 import com.eitc.patient.mapper.MedicalHistoryMapper;
+import com.eitc.patient.param.MedicalRecordSaveParam;
 import com.eitc.patient.service.IMedicalHistoryService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -134,62 +134,72 @@ public class MedicalHistoryServiceImpl extends ServiceImpl<MedicalHistoryMapper,
     /**
      * 查询患者的病史保存到历史记录中
      *
-     * @param patientId       患者id
-     * @param medicalRecordId 病历id
+     * @param param           参数
+     * @param medicalRecordId 病例id
      * @author mtx
      * @date: 2024/5/22 13:57
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public void saveMedicalHistoryToMedicalRecordIdByPatientId(String patientId, String medicalRecordId) {
-        // 查询患者保存的病史
-        List<MedicalHistory> list = this.list(Wrappers.<MedicalHistory>lambdaQuery().eq(MedicalHistory::getPatientId, patientId));
-        if (CollectionUtils.isEmpty(list)) {
-            return;
-        }
+    public void saveMedicalHistoryByHistoryType(MedicalRecordSaveParam param, String medicalRecordId) {
+        List<MedicalHistory> list = new ArrayList<>();
         // 封装并保存记录
-        List<MedicalHistory> lists = list.stream().map(item -> {
-            MedicalHistory medicalHistory = new MedicalHistory();
-            medicalHistory.setMedicalRecordId(medicalRecordId);
-            medicalHistory.setDiseaseType(item.getDiseaseType());
-            medicalHistory.setDiseaseContent(item.getDiseaseContent());
-            medicalHistory.setDiseaseSource(MedicalHistoryDiseaseSourceEnum.PATIENT.getCode());
-            return medicalHistory;
-        }).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(param.getDoctorAllergyHistory())) {
+            list.addAll(param.getDoctorAllergyHistory().stream().map(item -> {
+                MedicalHistory medicalHistory = new MedicalHistory();
+                medicalHistory.setMedicalRecordId(medicalRecordId);
+                medicalHistory.setDiseaseType(MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getCode());
+                medicalHistory.setDiseaseContent(item);
+                medicalHistory.setDiseaseSource(MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode());
+                return medicalHistory;
+            }).collect(Collectors.toList()));
+        }
+        if (CollectionUtils.isNotEmpty(param.getDoctorPastHistory())) {
+            list.addAll(param.getDoctorPastHistory().stream().map(item -> {
+                MedicalHistory medicalHistory = new MedicalHistory();
+                medicalHistory.setMedicalRecordId(medicalRecordId);
+                medicalHistory.setDiseaseType(MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getCode());
+                medicalHistory.setDiseaseContent(item);
+                medicalHistory.setDiseaseSource(MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode());
+                return medicalHistory;
+            }).collect(Collectors.toList()));
+        }
+        if (CollectionUtils.isNotEmpty(param.getDoctorFamilyHistory())) {
+            list.addAll(param.getDoctorFamilyHistory().stream().map(item -> {
+                MedicalHistory medicalHistory = new MedicalHistory();
+                medicalHistory.setMedicalRecordId(medicalRecordId);
+                medicalHistory.setDiseaseType(MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getCode());
+                medicalHistory.setDiseaseContent(item);
+                medicalHistory.setDiseaseSource(MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode());
+                return medicalHistory;
+            }).collect(Collectors.toList()));
+        }
 
         this.remove(Wrappers.<MedicalHistory>lambdaQuery()
                 .eq(MedicalHistory::getMedicalRecordId, medicalRecordId)
-                .eq(MedicalHistory::getDiseaseSource, MedicalHistoryDiseaseSourceEnum.PATIENT.getCode()));
-        this.saveBatch(lists);
+                .eq(MedicalHistory::getDiseaseSource, MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode()));
+        this.saveBatch(list);
     }
 
     /**
      * 根据患者ID、疾病类型和诊断类型模板详情，查询患者的病史信息。
      * 此方法主要用于检索与特定疾病类型和患者相关的病史记录，并根据病史来源筛选出患者自述的病史内容。
      *
-     * @param patientId 患者的唯一标识ID，用于查询特定患者的病史记录。
+     * @param patientId   患者的唯一标识ID，用于查询特定患者的病史记录。
      * @param diseaseType 疾病类型的标识，用于筛选特定类型的病史记录。
-     * @param detailsVO 诊断类型模板详情的DTO（数据传输对象），用于接收和存储查询结果。
-     *                  此对象将包含患者自述的病史内容列表和这些内容的格式化列表。
      * @author mtx
      * @date 2024/06/07 14:01
      */
     @Override
-    public void findMedicalHistory(String patientId, Integer diseaseType, DiagnosisTypeTemplateDto detailsVO) {
+    public List<String> findMedicalHistory(String patientId, Integer diseaseType) {
         // 根据疾病类型和患者ID查询所有的病史记录
         List<MedicalHistory> histories = this.list(Wrappers.<MedicalHistory>lambdaQuery()
                 .eq(MedicalHistory::getDiseaseType, diseaseType)
+                .eq(MedicalHistory::getDiseaseSource, MedicalHistoryDiseaseSourceEnum.PATIENT.getCode())
                 .eq(MedicalHistory::getPatientId, patientId));
 
         // 筛选病史来源为患者自述的病史记录，将病史内容拼接为字符串，用逗号分隔，存储到detailsVO中
-        detailsVO.setPatientMedicalRecord(histories.stream()
-                .filter(li -> MedicalHistoryDiseaseSourceEnum.PATIENT.getCode().equals(li.getDiseaseSource()))
-                .map(MedicalHistory::getDiseaseContent).collect(Collectors.joining(",")));
-
-        // 筛选病史来源为患者自述的病史记录，将病史内容收集到列表中，存储到detailsVO中
-        detailsVO.setFormattedPartsList(histories.stream()
-                .filter(li -> MedicalHistoryDiseaseSourceEnum.PATIENT.getCode().equals(li.getDiseaseSource()))
-                .map(MedicalHistory::getDiseaseContent).collect(Collectors.toList()));
+        return histories.stream().map(MedicalHistory::getDiseaseContent).collect(Collectors.toList());
     }
 
 

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/MedicalRecordDetailsServiceImpl.java

@@ -1,28 +1,11 @@
 package com.eitc.patient.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.eitc.common.utils.bean.BeanUtils;
-import com.eitc.patient.domain.MedicalHistory;
-import com.eitc.patient.domain.MedicalRecord;
 import com.eitc.patient.domain.MedicalRecordDetails;
-import com.eitc.patient.dto.MedicalRecordHistoryDto;
-import com.eitc.patient.enums.MedicalHistoryDiseaseSourceEnum;
-import com.eitc.patient.enums.MedicalHistoryDiseaseTypeEnum;
 import com.eitc.patient.mapper.MedicalRecordDetailsMapper;
-import com.eitc.patient.service.IMedicalHistoryService;
 import com.eitc.patient.service.IMedicalRecordDetailsService;
-import com.eitc.patient.vo.MedicalRecordDetailsVO;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 /**
  * MedicalRecordDetailsServiceImpl
  *
@@ -32,97 +15,4 @@ import java.util.stream.Collectors;
 @Service
 public class MedicalRecordDetailsServiceImpl extends ServiceImpl<MedicalRecordDetailsMapper, MedicalRecordDetails> implements IMedicalRecordDetailsService {
 
-    @Resource
-    private IMedicalHistoryService medicalHistoryService;
-
-    /**
-     * 通过病历id获取病历详情vo
-     * @param medicalRecordId 病历id
-     * @return 病历详情vo
-     * @author mtx
-     * @date: 2024/6/5 9:10
-     */
-    @Override
-    public List<MedicalRecordDetailsVO> findMedicalRecordDetailsVOByMedicalRecordId(String medicalRecordId) {
-        List<MedicalRecordDetails> list = this.list(Wrappers.<MedicalRecordDetails>lambdaQuery()
-                .eq(MedicalRecordDetails::getMedicalRecordId, medicalRecordId)
-                .orderByAsc(MedicalRecordDetails::getOrderNum));
-        if (CollectionUtils.isNotEmpty(list)) {
-            // 封装病例详情数据
-            return list.stream().map(item -> {
-                MedicalRecordDetailsVO detailsVO = new MedicalRecordDetailsVO();
-                BeanUtils.copyProperties(item, detailsVO);
-                // 根据病历ID和疾病类型，查询病史信息，并将查询结果封装到MedicalRecordDetailsVO对象中。
-                if (MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getInfo().equals(detailsVO.getTemplateName())) {
-                    findMedicalHistory(medicalRecordId, MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getCode(), detailsVO);
-                }
-                if (MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getInfo().equals(detailsVO.getTemplateName())) {
-                    findMedicalHistory(medicalRecordId, MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getCode(), detailsVO);
-                }
-                if (MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getInfo().equals(detailsVO.getTemplateName())) {
-                    findMedicalHistory(medicalRecordId, MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getCode(), detailsVO);
-                }
-                return detailsVO;
-            }).collect(Collectors.toList());
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    /**
-     * 统计诊断分类
-     *
-     * @return 统计结果
-     * @author mtx
-     * @date: 2024/6/5 9:10
-     */
-    @Override
-    public List<Map<String, String>> countByDiagnosisTypeName() {
-        return this.baseMapper.countByDiagnosisTypeName();
-    }
-
-    /**
-     * 根据牙齿位置检查访问类型
-     *
-     * @return 返回访问类型，具体类型根据业务逻辑确定
-     */
-    @Override
-    public List<MedicalRecord> findListByToothPosition(MedicalRecordHistoryDto dto) {
-        return this.baseMapper.findListByToothPosition(dto);
-    }
-
-    /**
-     * 根据病历ID和疾病类型，查询病史信息，并将查询结果封装到MedicalRecordDetailsVO对象中。
-     *
-     * @param medicalRecordId 病历ID，用于查询特定病历的病史。
-     * @param diseaseType 疾病类型，用于筛选特定类型的病史记录。
-     * @param detailsVO 一个MedicalRecordDetailsVO对象，用于存储查询结果。
-     *                  该对象将包含患者自述病史和医生记录的病史。
-     */
-    private void findMedicalHistory(String medicalRecordId, Integer diseaseType, MedicalRecordDetailsVO detailsVO) {
-        // 根据病历ID和疾病类型查询所有的病史记录
-        List<MedicalHistory> histories = medicalHistoryService.list(Wrappers.<MedicalHistory>lambdaQuery()
-                .eq(MedicalHistory::getDiseaseType, diseaseType)
-                .eq(MedicalHistory::getMedicalRecordId, medicalRecordId));
-
-        // 分别筛选出患者自述和医生记录的病史内容，并将它们加入到detailsVO对象中
-        detailsVO.setPatientMedicalRecord(histories.stream()
-                .filter(li -> MedicalHistoryDiseaseSourceEnum.PATIENT.getCode().equals(li.getDiseaseSource()))
-                .map(MedicalHistory::getDiseaseContent).collect(Collectors.joining(",")));
-        detailsVO.setDoctorMedicalRecord(histories.stream()
-                .filter(li -> MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode().equals(li.getDiseaseSource()))
-                .map(MedicalHistory::getDiseaseContent).collect(Collectors.joining(",")));
-
-        // 根据患者自述和医生记录的病史内容，设置最终的内容信息
-        String patientMedicalRecord = detailsVO.getPatientMedicalRecord();
-        String doctorMedicalRecord = detailsVO.getDoctorMedicalRecord();
-        if (StringUtils.isNotBlank(patientMedicalRecord) && StringUtils.isNotBlank(doctorMedicalRecord)) {
-            detailsVO.setContentInfo(patientMedicalRecord + "，" + doctorMedicalRecord);
-        } else if (StringUtils.isNotBlank(patientMedicalRecord)) {
-            detailsVO.setContentInfo(patientMedicalRecord);
-        } else if (StringUtils.isNotBlank(doctorMedicalRecord)) {
-            detailsVO.setContentInfo(doctorMedicalRecord);
-        }
-    }
-
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/MedicalRecordServiceImpl.java

@@ -1,33 +1,24 @@
 package com.eitc.patient.service.impl;
 
-import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.eitc.patient.constant.PatientConstant;
-import com.eitc.patient.domain.DiagnosisType;
-import com.eitc.patient.domain.DiagnosisTypeTemplate;
-import com.eitc.patient.domain.MedicalHistory;
+import com.eitc.common.utils.bean.BeanUtils;
 import com.eitc.patient.domain.MedicalRecord;
 import com.eitc.patient.domain.MedicalRecordDetails;
 import com.eitc.patient.domain.PatientAppointment;
+import com.eitc.patient.dto.MedicalRecordHistoryDto;
 import com.eitc.patient.dto.MedicalRecordListDto;
-import com.eitc.patient.enums.MedicalHistoryDiseaseSourceEnum;
-import com.eitc.patient.enums.MedicalHistoryDiseaseTypeEnum;
 import com.eitc.patient.enums.MedicalRecordStatusEnum;
 import com.eitc.patient.enums.PatientAppointmentStatusEnum;
 import com.eitc.patient.mapper.MedicalRecordMapper;
+import com.eitc.patient.param.MedicalRecordSaveParam;
 import com.eitc.patient.service.ICollectCostPatientsService;
-import com.eitc.patient.service.IDiagnosisTypeService;
-import com.eitc.patient.service.IDiagnosisTypeTemplateService;
 import com.eitc.patient.service.IMedicalHistoryService;
 import com.eitc.patient.service.IMedicalRecordDetailsService;
 import com.eitc.patient.service.IMedicalRecordService;
 import com.eitc.patient.service.IPatientAppointmentService;
-import com.eitc.patient.vo.FormattedPartsVO;
-import com.eitc.patient.vo.MedicalRecordDetailsVO;
-import com.eitc.patient.vo.MedicalRecordParamVO;
-import com.eitc.patient.vo.MedicalRecordVO;
+import com.eitc.patient.vo.MedicalRecordToothVO;
 import com.eitc.system.utils.UserCacheUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -36,14 +27,10 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 
 /**
  * MedicalRecordServiceImpl
@@ -59,10 +46,6 @@ public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapper, M
     @Resource
     private IMedicalRecordDetailsService medicalRecordDetailsService;
     @Resource
-    private IDiagnosisTypeTemplateService diagnosisTypeTemplateService;
-    @Resource
-    private IDiagnosisTypeService diagnosisTypeService;
-    @Resource
     private IPatientAppointmentService patientAppointmentService;
     @Resource
     private ICollectCostPatientsService collectCostPatientsService;
@@ -70,45 +53,38 @@ public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapper, M
     /**
      * 保存或编辑病历信息。
      *
-     * @param vo 包含病历及相关信息的参数对象。
+     * @param param 包含病历及相关信息的参数对象。
      * @author mtx
      * @date 2024/5/22 10:00
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public void addOrEdit(MedicalRecordParamVO vo) {
-        // 检查病历详情列表是否为空
-        List<MedicalRecordVO> dataList = vo.getDataList();
-        if (CollectionUtils.isEmpty(dataList)) {
-            throw new RuntimeException("病历详情不能为空");
-        }
-
+    public void addOrEdit(MedicalRecordSaveParam param) {
         // 初始化病历对象并设置基本信息，保存病历信息
-        MedicalRecord medicalRecord = saveMedicalRecordInfo(vo);
+        MedicalRecord medicalRecord = saveMedicalRecordInfo(param);
 
         // 保存个人录入的病史信息到病历记录中
-        medicalHistoryService.saveMedicalHistoryToMedicalRecordIdByPatientId(medicalRecord.getPatientId(), medicalRecord.getId());
+        medicalHistoryService.saveMedicalHistoryByHistoryType(param, medicalRecord.getId());
 
         // 初始化标志位和计数器，用于后续处理
         AtomicBoolean flag = new AtomicBoolean(true);
-        AtomicInteger num = new AtomicInteger(1);
         List<MedicalRecordDetails> recordDetailsList = new ArrayList<>();
 
-        // 遍历病历详情列表，处理每条详情信息
-        dataList.forEach(medicalRecordVO -> {
-            List<MedicalRecordDetailsVO> data = medicalRecordVO.getData();
-
-            data.forEach(medicalRecordDetailsVO -> {
-                MedicalRecordDetails recordDetails = saveMedicalRecordDetails(medicalRecord.getId(), flag, num,
-                        medicalRecordVO.getToothStatus(), medicalRecordVO.getToothPosition(), medicalRecordDetailsVO);
+        List<MedicalRecordToothVO> dataList = param.getToothList();
+        if (CollectionUtils.isNotEmpty(dataList)) {
+            // 遍历病历详情列表，处理每条详情信息
+            dataList.forEach(medicalRecordToothVO -> {
+                MedicalRecordDetails recordDetails = new MedicalRecordDetails();
+                BeanUtils.copyProperties(medicalRecordToothVO, recordDetails);
+                recordDetails.setMedicalRecordId(medicalRecord.getId());
                 recordDetailsList.add(recordDetails);
             });
-        });
+        }
 
         // 修改预约状态
-        if (StringUtils.isNotBlank(vo.getAppointmentId())) {
+        if (StringUtils.isNotBlank(param.getAppointmentId())) {
             PatientAppointment appointment = new PatientAppointment();
-            appointment.setId(vo.getAppointmentId());
+            appointment.setId(param.getAppointmentId());
             appointment.setMedicalRecordId(medicalRecord.getId());
             appointment.setAppointmentStatus(flag.get() ? PatientAppointmentStatusEnum.TREATMENT_COMPLETED.getCode() : PatientAppointmentStatusEnum.IN_TREATMENT.getCode());
             patientAppointmentService.updateById(appointment);
@@ -128,214 +104,39 @@ public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapper, M
         this.updateById(mr);
     }
 
-    /**
-     * 封装病历详情信息。
-     *
-     * @param medicalRecordId        病历
-     * @param flag                   标志位
-     * @param num                    排序
-     * @param toothStatus            牙位状态
-     * @param toothPosition          牙位
-     * @param medicalRecordDetailsVO 病历详情VO
-     * @return 返回结果
-     * @author mtx
-     * @date: 2024/7/18 15:01
-     */
-    private MedicalRecordDetails saveMedicalRecordDetails(String medicalRecordId, AtomicBoolean flag, AtomicInteger num, Integer toothStatus, String toothPosition, MedicalRecordDetailsVO medicalRecordDetailsVO) {
-        // 根据诊断类型模板ID获取模板信息
-        String templateId = medicalRecordDetailsVO.getDiagnosisTypeTemplateId();
-        DiagnosisTypeTemplate diagnosisTypeTemplate = diagnosisTypeTemplateService.getById(templateId);
-        if (Objects.isNull(diagnosisTypeTemplate)) {
-            throw new RuntimeException("诊断分类模板表获取失败");
-        }
-
-        // 处理选择项信息，如选项拼接
-        String option = "";
-        if (Objects.nonNull(medicalRecordDetailsVO.getFormattedParts())) {
-            option = medicalRecordDetailsVO.getFormattedParts().stream()
-                    .filter(li -> "select".equals(li.getType()))
-                    .map(FormattedPartsVO::getValue)
-                    .collect(Collectors.joining(","));
-        }
-
-        // 初始化并设置病历详情对象属性
-        MedicalRecordDetails recordDetails = new MedicalRecordDetails();
-        recordDetails.setMedicalRecordId(medicalRecordId);
-        recordDetails.setDiagnosisTypeTemplateId(templateId);
-        recordDetails.setDiagnosisTypeId(diagnosisTypeTemplate.getDiagnosisTypeId());
-        DiagnosisType diagnosisType = diagnosisTypeService.getById(diagnosisTypeTemplate.getDiagnosisTypeId());
-        if (Objects.nonNull(diagnosisType)) {
-            recordDetails.setDiagnosisTypeName(diagnosisType.getDiagnosisName());
-        }
-        recordDetails.setToothPosition(toothPosition);
-        if (Objects.isNull(toothStatus) || !MedicalRecordStatusEnum.ALREADY_COMPLETE.getCode().equals(toothStatus)) {
-            flag.set(false);
-        }
-        recordDetails.setToothStatus(toothStatus);
-        recordDetails.setTemplateName(medicalRecordDetailsVO.getTemplateName());
-        recordDetails.setTemplateExample(medicalRecordDetailsVO.getTemplateExample());
-        recordDetails.setTemplateInfo(medicalRecordDetailsVO.getTemplateInfo());
-        recordDetails.setTemplateOption(option);
-        recordDetails.setOrderNum(num.getAndIncrement());
-
-        String templateExample = recordDetails.getTemplateExample();
-        String templateInfo = diagnosisTypeTemplateService.findTemplateInfo(templateExample);
-
-        recordDetails.setContentInfo(
-                encapsulationTemplateInfo(templateInfo, recordDetails.getTemplateOption()));
-
-        List<String> list = new ArrayList<>();
-        String patientMedicalRecord = medicalRecordDetailsVO.getPatientMedicalRecord();
-        if (StringUtils.isNotBlank(patientMedicalRecord)) {
-            list.addAll(Arrays.asList(patientMedicalRecord.split(",")));
-        }
-        if ("过敏史".equals(medicalRecordDetailsVO.getTemplateName())) {
-            String collect = medicalRecordDetailsVO.getFormattedPartsList().stream()
-                    .filter(li -> !list.contains(li)).collect(Collectors.joining(","));
-
-            // 保存医生填写的病史
-            medicalHistoryService.saveMedicalHistoryList(
-                    collect, null, null,
-                    medicalRecordId, null, MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode());
-        }
-        if ("既往史".equals(medicalRecordDetailsVO.getTemplateName())) {
-            String collect = medicalRecordDetailsVO.getFormattedPartsList().stream()
-                    .filter(li -> !list.contains(li)).collect(Collectors.joining(","));
-            // 保存医生填写的病史
-            medicalHistoryService.saveMedicalHistoryList(
-                    null, collect, null,
-                    medicalRecordId, null, MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode());
-        }
-        if ("家族史".equals(medicalRecordDetailsVO.getTemplateName())) {
-            String collect = medicalRecordDetailsVO.getFormattedPartsList().stream()
-                    .filter(li -> !list.contains(li)).collect(Collectors.joining(","));
-            // 保存医生填写的病史
-            medicalHistoryService.saveMedicalHistoryList(
-                    null, null, collect,
-                    medicalRecordId, null, MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode());
-        }
-
-        String jsonString = JSONArray.toJSONString(medicalRecordDetailsVO.getFormattedParts());
-        recordDetails.setTemplateView(jsonString);
-        return recordDetails;
-    }
 
     /**
      * 初始化病历对象并设置基本信息，保存病历信息
      *
-     * @param vo 参数
+     * @param param 参数
      * @return 返回
      */
     @Transactional(rollbackFor = {Exception.class})
-    public MedicalRecord saveMedicalRecordInfo(MedicalRecordParamVO vo) {
+    public MedicalRecord saveMedicalRecordInfo(MedicalRecordSaveParam param) {
         MedicalRecord medicalRecord = new MedicalRecord();
-        medicalRecord.setAttendingDoctorId(vo.getAttendingDoctorId());
-        medicalRecord.setAttendingDoctorName(UserCacheUtil.getSysUserById(vo.getAttendingDoctorId()).getNickName());
-        medicalRecord.setPatientId(vo.getPatientId());
-        medicalRecord.setStatus(vo.getStatus());
+        medicalRecord.setPatientId(param.getPatientId());
+        medicalRecord.setVisitType(param.getVisitType());
+        medicalRecord.setAttendingDoctorId(param.getAttendingDoctorId());
+        medicalRecord.setAttendingDoctorName(UserCacheUtil.getSysUserById(param.getAttendingDoctorId()).getNickName());
         medicalRecord.setOutpatientService(UserCacheUtil.getClinicName());
-        medicalRecord.setDepartment(UserCacheUtil.getSysDeptByUserId(vo.getAttendingDoctorId()).getDeptName());
+        medicalRecord.setDepartment(UserCacheUtil.getSysDeptByUserId(param.getAttendingDoctorId()).getDeptName());
         medicalRecord.setCost(BigDecimal.ZERO);
 
-        if (Objects.nonNull(vo.getId())) {
-            medicalRecord.setId(vo.getId());
-        }
-        medicalRecord.setVisitType(vo.getVisitType());
-        this.saveOrUpdate(medicalRecord);
-        return medicalRecord;
-    }
+        medicalRecord.setChiefComplaintContent(param.getChiefComplaintContent());
+        medicalRecord.setPresentIllnessContent(param.getPresentIllnessContent());
+        medicalRecord.setInspectContent(param.getInspectContent());
+        medicalRecord.setTreatmentPlanningContent(param.getTreatmentPlanningContent());
+        medicalRecord.setDisposeContent(param.getDisposeContent());
+        medicalRecord.setNoteContent(param.getNoteContent());
+        medicalRecord.setDiagnosisContent(param.getDiagnosisContent());
 
-    /**
-     * 封装病历信息
-     *
-     * @param medicalRecord 病历信息
-     * @return 病历信息
-     * @author mtx
-     * @date: 2024/5/23 9:17
-     */
-    @Override
-    public MedicalRecordParamVO getMedicalRecordVO(MedicalRecord medicalRecord) {
-        // 创建一个新的VO对象，用于存储处理后的病历信息
-        MedicalRecordParamVO vo = new MedicalRecordParamVO();
-        // 将病历实体的基本信息赋值给VO对象
-        vo.setId(medicalRecord.getId());
-        vo.setVisitType(medicalRecord.getVisitType());
-        vo.setStatus(medicalRecord.getStatus());
-        vo.setPatientId(medicalRecord.getPatientId());
-        vo.setAttendingDoctorId(medicalRecord.getAttendingDoctorId());
-        vo.setAttendingDoctorName(medicalRecord.getAttendingDoctorName());
-
-        vo.setDepartment(medicalRecord.getDepartment());
-        vo.setCost(medicalRecord.getCost());
-        vo.setClinicName(medicalRecord.getOutpatientService());
-        vo.setCreateDate(medicalRecord.getCreateDate());
-
-        // 初始化存储详细数据的列表
-        List<MedicalRecordVO> dataList = new ArrayList<>();
-        // 根据病历ID查询详细的医疗记录
-        List<MedicalRecordDetails> list = medicalRecordDetailsService.list(Wrappers.<MedicalRecordDetails>lambdaQuery()
-                .eq(MedicalRecordDetails::getMedicalRecordId, medicalRecord.getId())
-                .orderByAsc(MedicalRecordDetails::getOrderNum));
-        // 将详细信息按牙齿位置分组
-        Map<String, List<MedicalRecordDetails>> collect = list.stream().collect(Collectors.groupingBy(MedicalRecordDetails::getToothPosition));
-        // 遍历分组后的数据
-        for (String key : collect.keySet()) {
-            MedicalRecordVO medicalRecordVO = new MedicalRecordVO();
-            medicalRecordVO.setToothPosition(key);
+        medicalRecord.setSaveStatus(param.getSaveStatus());
 
-            List<MedicalRecordDetails> detailsList = collect.get(key);
-            // 如果详细数据为空，则在VO中设置为空列表
-            if (CollectionUtils.isEmpty(detailsList)) {
-                medicalRecordVO.setData(new ArrayList<>());
-            } else {
-                // 处理每个牙齿的详细信息，并将其添加到VO中
-                List<MedicalRecordDetailsVO> details = new ArrayList<>();
-                detailsList.stream().sorted(Comparator.comparing(MedicalRecordDetails::getOrderNum)).forEach(li -> {
-                    MedicalRecordDetailsVO medicalRecordDetailsVO = new MedicalRecordDetailsVO();
-
-                    // 根据模板名称，填充VO中的对应信息
-                    if ("诊断".equals(li.getTemplateName()) && StringUtils.isBlank(vo.getDiagnosisTypeCn())) {
-                        vo.setDiagnosisTypeCn(li.getDiagnosisTypeName());
-                    }
-                    if ("治疗计划".equals(li.getTemplateName()) && StringUtils.isBlank(vo.getTreatment())) {
-                        vo.setTreatment(li.getContentInfo());
-                    }
-                    medicalRecordVO.setToothStatus(li.getToothStatus());
-
-                    // 将详细信息的各个字段从实体对象复制到VO对象
-                    medicalRecordDetailsVO.setMedicalRecordDetailsId(li.getId());
-                    medicalRecordDetailsVO.setDiagnosisTypeTemplateId(li.getDiagnosisTypeTemplateId());
-                    medicalRecordDetailsVO.setDiagnosisTypeId(li.getDiagnosisTypeId());
-                    medicalRecordDetailsVO.setDiagnosisTypeCn(li.getDiagnosisTypeName());
-                    medicalRecordDetailsVO.setTemplateName(li.getTemplateName());
-                    medicalRecordDetailsVO.setTemplateExample(li.getTemplateExample());
-                    medicalRecordDetailsVO.setTemplateExample2(li.getTemplateExample());
-                    medicalRecordDetailsVO.setContentInfo(li.getContentInfo());
-                    medicalRecordDetailsVO.setTemplateInfo(li.getTemplateInfo());
-                    medicalRecordDetailsVO.setTemplateOption(li.getTemplateOption());
-
-                    // 根据病历ID查询相关的病史信息，并根据类型进行处理
-                    List<MedicalHistory> histories = medicalHistoryService.list(Wrappers.<MedicalHistory>lambdaQuery().eq(MedicalHistory::getMedicalRecordId, li.getMedicalRecordId()));
-                    if (MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getInfo().equals(li.getTemplateName())) {
-                        findMedicalHistory(medicalRecordDetailsVO, histories, MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getCode());
-                    } else if (MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getInfo().equals(li.getTemplateName())) {
-                        findMedicalHistory(medicalRecordDetailsVO, histories, MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getCode());
-                    } else if (MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getInfo().equals(li.getTemplateName())) {
-                        findMedicalHistory(medicalRecordDetailsVO, histories, MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getCode());
-                    }
-
-                    // 处理模板视图信息，并将其转换为VO对象
-                    medicalRecordDetailsVO.setFormattedParts(JSONArray.parseArray(li.getTemplateView(), FormattedPartsVO.class));
-                    details.add(medicalRecordDetailsVO);
-                });
-                // 将处理后的详细数据添加到VO中
-                medicalRecordVO.setData(details);
-            }
-            dataList.add(medicalRecordVO);
+        if (Objects.nonNull(param.getId())) {
+            medicalRecord.setId(param.getId());
         }
-
-        vo.setDataList(dataList);
-        return vo;
+        this.saveOrUpdate(medicalRecord);
+        return medicalRecord;
     }
 
     /**
@@ -348,87 +149,35 @@ public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapper, M
      */
     @Override
     public List<MedicalRecordListDto> medicalRecordList(String searchParam) {
-        List<MedicalRecordListDto> dtos = this.getBaseMapper().medicalRecordList(null);
-        if (CollectionUtils.isEmpty(dtos)) {
-            return dtos;
-        }
-        for (MedicalRecordListDto dto : dtos) {
-            String id = dto.getId();
-            List<MedicalRecordDetails> list = medicalRecordDetailsService.list(Wrappers.<MedicalRecordDetails>lambdaQuery()
-                    .eq(MedicalRecordDetails::getMedicalRecordId, id));
-            if (CollectionUtils.isEmpty(list)) {
-                continue;
-            }
-            String collect = list.stream().map(MedicalRecordDetails::getContentInfo)
-                    .filter(StringUtils::isNotBlank).collect(Collectors.joining(","));
-            dto.setContentInfo(collect);
-        }
-        if (StringUtils.isNotBlank(searchParam)) {
-            dtos = dtos.stream().filter(dto -> dto.getContentInfo().contains(searchParam)
-                    || dto.getAttendingDoctorName().contains(searchParam)
-                    || dto.getPatientName().contains(searchParam)).collect(Collectors.toList());
-        }
-        return dtos;
+        return this.getBaseMapper().medicalRecordList(searchParam);
     }
 
     /**
-     * 根据用户编号和疾病类型，查找并设置病人的医疗记录详情。
-     * 此方法会分别筛选出患者自述和医生诊断的疾病内容，并将其分别设置到医疗记录详情对象中。
-     * 同时，还会设置一份格式化的疾病内容列表。
+     * 统计诊断分类
      *
-     * @param medicalRecordDetailsVO 医疗记录详情对象，用于存储查询结果。
-     * @param histories              病历库中的所有病历记录列表。
-     * @param diseaseType            疾病类型，用于筛选特定类型的病历。
+     * @return 统计结果
+     * @author mtx
+     * @date: 2024/6/5 9:10
      */
-    private void findMedicalHistory(MedicalRecordDetailsVO medicalRecordDetailsVO, List<MedicalHistory> histories, Integer diseaseType) {
-        // 根据疾病类型筛选出相应的病历记录
-        List<MedicalHistory> collect = histories.stream().filter(l -> diseaseType.equals(l.getDiseaseType())).collect(Collectors.toList());
-
-        // 设置患者自述的疾病内容，以逗号分隔
-        medicalRecordDetailsVO.setPatientMedicalRecord(collect.stream()
-                .filter(l -> MedicalHistoryDiseaseSourceEnum.PATIENT.getCode().equals(l.getDiseaseSource()))
-                .map(MedicalHistory::getDiseaseContent).collect(Collectors.joining(",")));
-
-        // 设置医生诊断的疾病内容，以逗号分隔
-        medicalRecordDetailsVO.setDoctorMedicalRecord(collect.stream()
-                .filter(l -> MedicalHistoryDiseaseSourceEnum.DOCTOR.getCode().equals(l.getDiseaseSource()))
-                .map(MedicalHistory::getDiseaseContent).collect(Collectors.joining(",")));
-
-        // 设置格式化的疾病内容列表，包含所有病历的疾病内容
-        medicalRecordDetailsVO.setFormattedPartsList(collect.stream().map(MedicalHistory::getDiseaseContent).collect(Collectors.toList()));
+    @Override
+    public List<Map<String, String>> countByDiagnosisTypeName() {
+        return this.baseMapper.countByDiagnosisTypeName();
     }
 
     /**
-     * 根据模板选项，将模板选项替换成模板示例
+     * 根据牙齿位置检查访问类型
      *
-     * @param templateInfo   模板信息
-     * @param templateOption 模板选项
-     * @return 替换后的数据
-     * @author mtx
-     * @date: 2024/5/23 9:15
+     * @return 返回访问类型，具体类型根据业务逻辑确定
      */
-    public String encapsulationTemplateInfo(String templateInfo, String templateOption) {
-        if (StringUtils.isEmpty(templateInfo)) {
-            return null;
-        }
-
-        String[] split = templateOption.split(",");
-        String keyPrefix = PatientConstant.DIAGNOSIS_TYPE_TEMPLATE_KEY_PREFIX;
-        int count = 0, i = 0;
-        while (templateInfo.indexOf(keyPrefix, i) >= 0) {
-            count++;
-            i = templateInfo.indexOf(keyPrefix, i) + keyPrefix.length();
+    @Override
+    public List<MedicalRecord> findListByToothPosition(MedicalRecordHistoryDto dto) {
+        if (CollectionUtils.isEmpty(dto.getToothPositionList())) {
+            return new ArrayList<>();
         }
-
-        for (int j = 0; j < count; j++) {
-            int i1 = j + 1;
-            String s = "";
-            try {
-                s = split[j];
-            } catch (Exception ignored) {
-            }
-            templateInfo = templateInfo.replace(keyPrefix + i1, s);
+        if (StringUtils.isBlank(dto.getPatientId())) {
+            throw new IllegalArgumentException("患者ID不能为空");
         }
-        return templateInfo;
+        return this.baseMapper.findListByToothPosition(dto);
     }
+
 }

eitc-patient-base/src/main/java/com/eitc/patient/tree/DiagnosisTypeTree.java

@@ -19,6 +19,20 @@ import java.util.List;
 @ApiModel("诊断分类表")
 public class DiagnosisTypeTree extends DiagnosisType {
 
+    private String diagnosisManageId;
+
+    @ApiModelProperty(value = "模板描述", name = "templateDesc")
+    private String templateDesc;
+
+    @ApiModelProperty(value = "诊断名称首拼", name = "diagnosisNamePinyinFirstLetter")
+    private String diagnosisNamePinyinFirstLetter;
+
+    @ApiModelProperty(value = "诊断名称拼音", name = "diagnosisNamePinyin")
+    private String diagnosisNamePinyin;
+
+    @ApiModelProperty(value = "就诊类型（1初诊，2复诊）", name = "visitType")
+    private Integer visitType;
+
     @ApiModelProperty(value = "子集", name = "childrenList")
     private List<DiagnosisTypeTree> childrenList;
 

eitc-patient-base/src/main/java/com/eitc/patient/utils/PatientUtil.java

@@ -2,7 +2,6 @@ package com.eitc.patient.utils;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.eitc.common.core.domain.entity.SysDictData;
 import com.eitc.common.core.domain.entity.SysRole;
 import com.eitc.common.core.domain.entity.SysUser;
 import com.eitc.common.core.domain.model.LoginUser;
@@ -11,14 +10,12 @@ import com.eitc.common.utils.PatientBaseUtil;
 import com.eitc.common.utils.SecurityUtils;
 import com.eitc.common.utils.spring.SpringUtils;
 import com.eitc.framework.security.context.PermissionContextHolder;
-import com.eitc.patient.constant.PatientConstant;
 import com.eitc.patient.domain.ClinicInfo;
 import com.eitc.patient.domain.SchedulingDetails;
 import com.eitc.patient.domain.SchedulingStatus;
 import com.eitc.patient.service.IClinicInfoService;
 import com.eitc.patient.service.ISchedulingDetailsService;
 import com.eitc.patient.service.ISchedulingStatusService;
-import com.eitc.system.service.ISysDictDataService;
 import com.eitc.system.service.ISysUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -38,33 +35,11 @@ import java.util.stream.Collectors;
  */
 @Component
 public class PatientUtil {
-    private final static ISysDictDataService sysDictDataService = SpringUtils.getBean(ISysDictDataService.class);
     private final static ISchedulingDetailsService schedulingDetailsService = SpringUtils.getBean(ISchedulingDetailsService.class);
     private final static ISchedulingStatusService schedulingStatusService = SpringUtils.getBean(ISchedulingStatusService.class);
     private final static IClinicInfoService clinicInfoService = SpringUtils.getBean(IClinicInfoService.class);
 
     /**
-     * 获取诊断类型模板的键列表。
-     * 该方法通过查询系统字典数据，获取特定类型（诊断类型模板名称）的所有字典项，
-     * 并将这些字典项的标签（dictLabel）收集到一个列表中返回。
-     * 如果查询结果为空，则返回一个空列表。
-     *
-     * @return List<String> 包含所有诊断类型模板键的列表。
-     */
-    public static List<String> diagnosisTypeTemplateKeyList() {
-        // 根据诊断类型模板名称查询系统字典数据
-        List<SysDictData> sysDictData = sysDictDataService.selectDictDataByType(PatientConstant.DICT_KEY_DIAGNOSIS_TYPE_TEMPLATE_NAME);
-
-        // 如果查询结果为空，则返回一个空列表
-        if (CollectionUtils.isEmpty(sysDictData)) {
-            return new ArrayList<>();
-        }
-
-        // 将查询到的字典数据的标签映射为列表，并返回该列表
-        return sysDictData.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
-    }
-
-    /**
      * 根据给定的星期几的数字返回对应的中文星期名称。
      * 使用Calendar类中的常量来表示星期几，提高代码的可读性和维护性。
      *
@@ -204,84 +179,6 @@ public class PatientUtil {
         return new ArrayList<>();
     }
 
-
-    /**
-     * 根据牙齿位置代码初始化牙齿位置描述
-     *
-     * @param toothPosition 牙齿位置代码，例如"upLeft1"
-     * @return 牙齿位置描述，如果代码无效，则返回"-"
-     */
-    public static String initToothPosition(String toothPosition) {
-        switch (toothPosition) {
-            case "upLeft1":
-                return "上左牙位1";
-            case "upLeft2":
-                return "上左牙位2";
-            case "upLeft3":
-                return "上左牙位3";
-            case "upLeft4":
-                return "上左牙位4";
-            case "upLeft5":
-                return "上左牙位5";
-            case "upLeft6":
-                return "上左牙位6";
-            case "upLeft7":
-                return "上左牙位7";
-            case "upLeft8":
-                return "上左牙位8";
-            case "upRight1":
-                return "上右牙位1";
-            case "upRight2":
-                return "上右牙位2";
-            case "upRight3":
-                return "上右牙位3";
-            case "upRight4":
-                return "上右牙位4";
-            case "upRight5":
-                return "上右牙位5";
-            case "upRight6":
-                return "上右牙位6";
-            case "upRight7":
-                return "上右牙位7";
-            case "upRight8":
-                return "上右牙位8";
-            case "downLeft1":
-                return "下左牙位1";
-            case "downLeft2":
-                return "下左牙位2";
-            case "downLeft3":
-                return "下左牙位3";
-            case "downLeft4":
-                return "下左牙位4";
-            case "downLeft5":
-                return "下左牙位5";
-            case "downLeft6":
-                return "下左牙位6";
-            case "downLeft7":
-                return "下左牙位7";
-            case "downLeft8":
-                return "下左牙位8";
-            case "downRight1":
-                return "下左牙位1";
-            case "downRight2":
-                return "下左牙位2";
-            case "downRight3":
-                return "下左牙位3";
-            case "downRight4":
-                return "下左牙位4";
-            case "downRight5":
-                return "下左牙位5";
-            case "downRight6":
-                return "下左牙位6";
-            case "downRight7":
-                return "下左牙位7";
-            case "downRight8":
-                return "下左牙位8";
-            default:
-                return "-";
-        }
-    }
-
     /**
      * 全部数据权限
      */

eitc-patient-base/src/main/java/com/eitc/patient/vo/DiagnosisTypeTemplateSaveVO.java

@@ -1,10 +1,12 @@
 package com.eitc.patient.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -17,11 +19,56 @@ import java.util.List;
 @ApiModel("诊断分类模板保存参数")
 public class DiagnosisTypeTemplateSaveVO {
 
+    private String id;
+
     @NotBlank(message = "诊断分类id不能为空")
     @ApiModelProperty(value = "诊断分类id", name = "diagnosisTypeId")
     private String diagnosisTypeId;
 
-    @ApiModelProperty(value = "模板列表", required = true, name = "diagnosisTypeTemplateList")
-    private List<DiagnosisTypeTemplateVO> diagnosisTypeTemplateList;
+    @ApiModelProperty(value = "模板名称", name = "templateName")
+    @NotBlank(message = "模板名称不能为空")
+    private String templateName;
+
+    @ApiModelProperty(value = "模板描述", name = "templateDesc")
+    @NotBlank(message = "模板描述不能为空")
+    private String templateDesc;
+
+    @ApiModelProperty(value = "诊断管理id", name = "diagnosisManageId")
+    @NotBlank(message = "诊断管理id不能为空")
+    private String diagnosisManageId;
+
+    @ApiModelProperty(value = "适用科室", name = "applyDept")
+    @NotNull(message = "适用科室不能为空")
+    private List<Long> applyDeptList;
+
+    @ApiModelProperty(value = "就诊类型（1初诊，2复诊）", name = "visitType")
+    @NotNull(message = "就诊类型不能为空")
+    private Integer visitType;
+
+    @ApiModelProperty(value = "启用状态（1启用，0未启用）", name = "enableStatus")
+    @NotNull(message = "启用状态不能为空")
+    private Integer enableStatus;
+
+    @ApiModelProperty(value = "主诉内容", name = "chiefComplaintContent")
+    @NotBlank(message = "主诉内容不能为空")
+    private String chiefComplaintContent;
+
+    @ApiModelProperty(value = "现病史内容", name = "presentIllnessContent")
+    private String presentIllnessContent;
+
+    @ApiModelProperty(value = "检查内容", name = "inspectContent")
+    @NotBlank(message = "检查内容不能为空")
+    private String inspectContent;
+
+    @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
+    @NotBlank(message = "治疗计划内容不能为空")
+    private String treatmentPlanningContent;
+
+    @ApiModelProperty(value = "处置内容", name = "disposeContent")
+    @NotBlank(message = "处置内容不能为空")
+    private String disposeContent;
+
+    @ApiModelProperty(value = "便签", name = "noteContent")
+    private String noteContent;
 
 }

eitc-patient-base/src/main/java/com/eitc/patient/vo/DiagnosisTypeTemplateVO.java

@@ -1,10 +1,12 @@
 package com.eitc.patient.vo;
 
+import com.eitc.patient.domain.DiagnosisTypeTemplate;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * DiagnosisTypeTemplateVO
@@ -12,16 +14,12 @@ import javax.validation.constraints.NotBlank;
  * @author mtx
  * @date: 2024/05/30 11:06
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("诊断分类模板表")
-public class DiagnosisTypeTemplateVO {
+public class DiagnosisTypeTemplateVO extends DiagnosisTypeTemplate {
 
-    @ApiModelProperty(value = "模板名称", name = "templateName")
-    @NotBlank(message = "模板名称不能为空")
-    private String templateName;
-
-    @ApiModelProperty(value = "模板示例", name = "templateExample")
-    @NotBlank(message = "模板示例不能为空")
-    private String templateExample;
+    @ApiModelProperty(value = "科室列表", name = "deptIdList")
+    private List<Long> applyDeptList;
 
 }

eitc-patient-base/src/main/java/com/eitc/patient/vo/FormattedPartsVO.java

@@ -1,31 +0,0 @@
-package com.eitc.patient.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * FormattedPartsVO
- *
- * @author mtx
- * @date: 2024/06/07 8:57
- */
-@Data
-@ApiModel("病例详情表")
-public class FormattedPartsVO {
-
-    @ApiModelProperty(value = "类型", name = "type")
-    private String type;
-    @ApiModelProperty(value = "文本", name = "text")
-    private String text;
-    @ApiModelProperty(value = "值", name = "value")
-    private String value;
-    @ApiModelProperty(value = "选项", name = "options")
-    private List<Map<String, String>> options;
-    @ApiModelProperty(value = "索引", name = "index")
-    private int index;
-
-}

eitc-patient-base/src/main/java/com/eitc/patient/vo/MedicalRecordDetailsVO.java

@@ -1,64 +0,0 @@
-package com.eitc.patient.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * MedicalRecordDetails
- *
- * @author mtx
- * @date: 2024/05/17 14:44
- */
-@Data
-@ApiModel("病例详情表")
-public class MedicalRecordDetailsVO {
-
-    private String medicalRecordDetailsId;
-    @ApiModelProperty(value = "诊断分类模板id", name = "diagnosisTypeTemplateId")
-    private String diagnosisTypeTemplateId;
-
-    @ApiModelProperty(value = "诊断分类id", name = "diagnosisTypeId")
-    private String diagnosisTypeId;
-
-    @ApiModelProperty(value = "诊断分类Cn", name = "diagnosisTypeCn")
-    private String diagnosisTypeCn;
-
-    @ApiModelProperty(value = "牙位", name = "toothPosition")
-    private String toothPosition;
-
-    @ApiModelProperty(value = "模板名称", name = "templateName")
-    private String templateName;
-
-    @ApiModelProperty(value = "模板示例", name = "templateExample")
-    private String templateExample;
-
-    @ApiModelProperty(value = "模板示例", name = "templateExample2")
-    private String templateExample2;
-
-    @ApiModelProperty(value = "内容信息", name = "contentInfo")
-    private String contentInfo;
-
-    @ApiModelProperty(value = "模板信息", name = "templateInfo")
-    private String templateInfo;
-
-    @ApiModelProperty(value = "模板选项", name = "templateOption")
-    private String templateOption;
-
-    @ApiModelProperty(value = "患者病史", name = "patientMedicalRecord")
-    private String patientMedicalRecord;
-
-    @ApiModelProperty(value = "医生录入病史", name = "doctorMedicalRecord")
-    private String doctorMedicalRecord;
-
-    private List<String> formattedPartsList;
-
-    @ApiModelProperty(value = "选项", name = "formattedParts")
-    private List<FormattedPartsVO> formattedParts;
-
-    private boolean flag = false;
-    private boolean flagCheck;
-
-}

eitc-patient-base/src/main/java/com/eitc/patient/vo/MedicalRecordListVO.java

@@ -0,0 +1,44 @@
+package com.eitc.patient.vo;
+
+import com.eitc.patient.domain.MedicalRecord;
+import com.eitc.patient.domain.MedicalRecordDetails;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * MedicalRecordListDto
+ *
+ * @author mtx
+ * @date: 2024/07/17 17:04
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("病例表")
+public class MedicalRecordListVO extends MedicalRecord {
+
+    @ApiModelProperty(value = "患者过敏史", name = "patientAllergyHistory")
+    private List<String> patientAllergyHistory;
+
+    @ApiModelProperty(value = "医生过敏史", name = "doctorAllergyHistory")
+    private List<String> doctorAllergyHistory;
+
+    @ApiModelProperty(value = "患者既往史", name = "patientPastHistory")
+    private List<String> patientPastHistory;
+
+    @ApiModelProperty(value = "医生既往史", name = "doctorPastHistory")
+    private List<String> doctorPastHistory;
+
+    @ApiModelProperty(value = "患者家族史", name = "patientFamilyHistory")
+    private List<String> patientFamilyHistory;
+
+    @ApiModelProperty(value = "医生家族史", name = "doctorFamilyHistory")
+    private List<String> doctorFamilyHistory;
+
+
+    @ApiModelProperty(value = "病例牙位列表", name = "recordDetailsList")
+    private List<MedicalRecordDetails> recordDetailsList;
+}

eitc-patient-base/src/main/java/com/eitc/patient/vo/MedicalRecordNoteVO.java

@@ -0,0 +1,33 @@
+package com.eitc.patient.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * MedicalRecordNoteVO
+ *
+ * @author mtx
+ * @date: 2024/05/17 14:42
+ */
+@Data
+@ApiModel("便签")
+public class MedicalRecordNoteVO {
+
+    @ApiModelProperty(value = "便签", name = "noteContent")
+    private String noteContent;
+
+    @ApiModelProperty(value = "诊断", name = "diagnosisContent")
+    private String diagnosisContent;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private Date createDate;
+
+    List<MedicalRecordToothVO> toothList;
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/vo/MedicalRecordParamVO.java

@@ -1,53 +0,0 @@
-package com.eitc.patient.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * MedicalRecordParamVO
- *
- * @author mtx
- * @date: 2024/06/07 9:38
- */
-@Data
-public class MedicalRecordParamVO {
-
-    private String id;
-    @ApiModelProperty(value = "预约id", name = "appointmentId")
-    private String appointmentId;
-    @ApiModelProperty(value = "患者id", name = "patientId")
-    private String patientId;
-    @ApiModelProperty(value = "状态（1未完成，2已完成治疗）", name = "status")
-    private Integer status;
-    @ApiModelProperty(value = "就诊类型（1初诊，2复诊）", name = "visitType")
-    private Integer visitType;
-    @ApiModelProperty(value = "主治医生", name = "attendingDoctorId")
-    private Long attendingDoctorId;
-
-    @ApiModelProperty(value = "科室", name = "department")
-    private String department;
-    @ApiModelProperty(value = "主治医生", name = "attendingDoctorName")
-    private String attendingDoctorName;
-    @ApiModelProperty(value = "费用", name = "cost")
-    private BigDecimal cost;
-    @ApiModelProperty(value = "诊所名称", name = "clinicName")
-    private String clinicName;
-
-    @ApiModelProperty(value = "诊断分类名称", name = "diagnosisTypeCn")
-    private String diagnosisTypeCn;
-    @ApiModelProperty(value = "治疗", name = "treatment")
-    private String treatment;
-
-    @ApiModelProperty(value = "创建时间", name = "createDate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createDate;
-
-    @ApiModelProperty(value = "病历详情", name = "dataList")
-    private List<MedicalRecordVO> dataList;
-
-}

eitc-patient-base/src/main/java/com/eitc/patient/vo/MedicalRecordTemplateVO.java

@@ -6,20 +6,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
- * MedicalRecordTemplate
+ * MedicalRecordVO
  *
  * @author mtx
- * @date: 2024/06/05 8:34
+ * @date: 2024/05/17 14:42
  */
 @Data
-@ApiModel("病例详情表")
-public class MedicalRecordTemplateVO {
-
-//    private String medicalRecordId;
+@ApiModel("打印病例")
+public class MedicalRecordToPdf {
 
     @ApiModelProperty(value = "患者姓名", name = "patientName")
     private String patientName;
@@ -61,8 +57,38 @@ public class MedicalRecordTemplateVO {
     @ApiModelProperty(value = "公司名称", name = "companyName")
     private String companyName;
 
-    private Map<String, List<MedicalRecordDetailsVO>> listMap;
-
     private String content;
 
+
+    @ApiModelProperty(value = "主诉内容", name = "chiefComplaintContent")
+    private String chiefComplaintContent;
+
+    @ApiModelProperty(value = "现病史内容", name = "presentIllnessContent")
+    private String presentIllnessContent;
+
+    @ApiModelProperty(value = "检查内容", name = "inspectContent")
+    private String inspectContent;
+
+    @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
+    private String treatmentPlanningContent;
+
+    @ApiModelProperty(value = "处置内容", name = "disposeContent")
+    private String disposeContent;
+
+    @ApiModelProperty(value = "便签", name = "noteContent")
+    private String noteContent;
+
+    @ApiModelProperty(value = "诊断", name = "diagnosisContent")
+    private String diagnosisContent;
+
+
+    @ApiModelProperty(value = "过敏史", name = "allergyHistory")
+    private String allergyHistory;
+
+    @ApiModelProperty(value = "既往史", name = "pastHistory")
+    private String pastHistory;
+
+    @ApiModelProperty(value = "家族史", name = "familyHistory")
+    private String familyHistory;
+
 }

eitc-patient-base/src/main/java/com/eitc/patient/vo/MedicalRecordVO.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * MedicalRecordVO
  *
@@ -13,8 +11,8 @@ import java.util.List;
  * @date: 2024/05/17 14:42
  */
 @Data
-@ApiModel("病例表")
-public class MedicalRecordVO {
+@ApiModel("病例牙齿")
+public class MedicalRecordToothVO {
 
     @ApiModelProperty(value = "牙位", name = "toothPosition")
     private String toothPosition;
@@ -22,7 +20,10 @@ public class MedicalRecordVO {
     @ApiModelProperty(value = "牙位状态（1未完成，2已完成治疗）", name = "toothStatus")
     private Integer toothStatus;
 
-    @ApiModelProperty(value = "病历详情", name = "data")
-    private List<MedicalRecordDetailsVO> data;
+    @ApiModelProperty(value = "诊断管理id", name = "diagnosisManageId")
+    private String diagnosisManageId;
+
+    @ApiModelProperty(value = "病例模板id", name = "diagnosisTypeTemplateId")
+    private String diagnosisTypeTemplateId;
 
 }

eitc-patient-base/src/main/java/com/eitc/patient/vo/PatientVO.java

@@ -41,4 +41,6 @@ public class PatientVO extends Patient {
 
     private String visitingPhysicianSet;
 
+    private Integer age;
+
 }

eitc-patient-base/src/main/resources/mapper/patient/BusinessDictDataMapper.xml

@@ -2,5 +2,5 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.eitc.patient.mapper.DiagnosisTypeMapper">
+<mapper namespace="com.eitc.patient.mapper.BusinessDictDataMapper">
 </mapper>

eitc-patient-base/src/main/resources/mapper/patient/MedicalRecordDetailsMapper.xml

@@ -3,42 +3,4 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.eitc.patient.mapper.MedicalRecordDetailsMapper">
-
-    <resultMap type="com.eitc.patient.domain.MedicalRecord" id="medicalRecordResult">
-        <id property="id" column="id"/>
-        <result property="patientId" column="patient_id"/>
-        <result property="status" column="status"/>
-        <result property="visitType" column="visit_type"/>
-        <result property="attendingDoctorId" column="attending_doctor_id"/>
-        <result property="attendingDoctorName" column="attending_doctor_name"/>
-        <result property="outpatientService" column="outpatient_service"/>
-        <result property="department" column="department"/>
-        <result property="cost" column="cost"/>
-        <result property="createDate" column="create_date"/>
-        <result property="createUser" column="create_user"/>
-        <result property="updateDate" column="update_date"/>
-        <result property="updateUser" column="update_user"/>
-    </resultMap>
-
-    <select id="countByDiagnosisTypeName" resultType="java.util.Map">
-        select *
-        from (select diagnosis_type_name diagnosisTypeName, count(*) count
-              from erm_medical_record_details
-              where is_del = 0
-              group by diagnosis_type_name) a
-        order by a.count desc
-        limit 10
-    </select>
-    <select id="findListByToothPosition" resultMap="medicalRecordResult">
-        select emr.*
-        from (select *
-              from erm_medical_record_details emrd
-              where emrd.is_del = 0 and emrd.tooth_position in
-                 <foreach collection="toothPositionList" item="toothPosition" open="(" separator="," close=")">
-                     #{toothPosition}
-                 </foreach>
-              group by emrd.medical_record_id) a
-                 inner join erm_medical_record emr on emr.id = a.medical_record_id and emr.is_del = 0
-        where emr.patient_id = #{patientId} order by emr.create_date desc
-    </select>
 </mapper>

eitc-patient-base/src/main/resources/mapper/patient/MedicalRecordMapper.xml

@@ -4,26 +4,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.eitc.patient.mapper.MedicalRecordMapper">
     <select id="medicalRecordList" resultType="com.eitc.patient.dto.MedicalRecordListDto">
-        select * from (
-            select emr.id,
-                ep.patient_name as patientName,
-                emr.create_date as createDate,
-                emr.visit_type as visitType,
-                emr.department as department,
-                emr.attending_doctor_name as attendingDoctorName,
-                (SELECT GROUP_CONCAT(DISTINCT emrd.tooth_position ORDER BY emrd.tooth_position SEPARATOR ',') AS toothPosition
-                FROM erm_medical_record_details emrd
-                where emrd.is_del = 0 and emrd.medical_record_id = emr.id) toothPosition
-            from erm_medical_record emr
-            left join erm_patient ep on emr.patient_id = ep.id
-            where emr.is_del = 0 order by emr.create_date desc
-        ) a
-        <where>
+        select emr.id,
+            ep.patient_name           as            patientName,
+            emr.create_date           as            createDate,
+            emr.visit_type            as            visitType,
+            emr.department            as            department,
+            emr.attending_doctor_name as            attendingDoctorName,
+            (SELECT GROUP_CONCAT(DISTINCT emrd.tooth_position ORDER BY emrd.tooth_position SEPARATOR ',') AS toothPosition
+            FROM erm_medical_record_details emrd where emrd.is_del = 0 and emrd.medical_record_id = emr.id) toothPosition
+        from erm_medical_record emr
+        left join erm_patient ep on emr.patient_id = ep.id
+        where emr.is_del = 0
             <if test="searchParam != null and searchParam != ''">
-                a.contentInfo like concat('%', #{searchParam}, '%')
-                or a.patientName like concat('%', #{searchParam}, '%')
-                or a.attendingDoctorName like concat('%', #{searchParam}, '%')
+                and (
+                    emr.chief_complaint_content like concat('%', #{searchParam}, '%')
+                    or emr.dispose_content like concat('%', #{searchParam}, '%')
+                    or emr.inspect_content like concat('%', #{searchParam}, '%')
+                    or emr.present_illness_content like concat('%', #{searchParam}, '%')
+                    or emr.treatment_planning_content like concat('%', #{searchParam}, '%')
+                    or emr.note_content like concat('%', #{searchParam}, '%')
+                    or ep.patient_name like concat('%', #{searchParam}, '%')
+                    or emr.attending_doctor_name like concat('%', #{searchParam}, '%')
+                )
             </if>
-        </where>
+        order by emr.create_date desc
+    </select>
+
+    <resultMap type="com.eitc.patient.domain.MedicalRecord" id="medicalRecordResult">
+        <id property="id" column="id"/>
+        <result property="patientId" column="patient_id"/>
+        <result property="status" column="status"/>
+        <result property="visitType" column="visit_type"/>
+        <result property="attendingDoctorId" column="attending_doctor_id"/>
+        <result property="attendingDoctorName" column="attending_doctor_name"/>
+        <result property="outpatientService" column="outpatient_service"/>
+        <result property="department" column="department"/>
+        <result property="cost" column="cost"/>
+        <result property="createDate" column="create_date"/>
+        <result property="createUser" column="create_user"/>
+        <result property="updateDate" column="update_date"/>
+        <result property="updateUser" column="update_user"/>
+    </resultMap>
+
+    <select id="countByDiagnosisTypeName" resultType="java.util.Map">
+        select * from (
+            select (select diagnosis_name from erm_diagnosis_manage where id = diagnosis_manage_id) diagnosisTypeName, count(*) count
+            from erm_medical_record_details
+            where is_del = 0
+            group by diagnosis_manage_id order by count desc
+        ) a where a.diagnosisTypeName is not null
+        limit 10
+    </select>
+
+    <select id="findListByToothPosition" resultMap="medicalRecordResult">
+        SELECT *
+        FROM erm_medical_record emr
+        where emr.is_del = 0
+        and emr.id in (select distinct emrd.medical_record_id from erm_medical_record_details emrd
+        where emrd.is_del = 0
+        <if test="toothPositionList != null">
+            and tooth_position in
+            <foreach collection="toothPositionList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        )
+        and emr.patient_id = #{patientId}
+        order by emr.create_date desc
     </select>
+
 </mapper>

eitc-patient-base/src/main/resources/mapper/patient/PatientFollowUpMapper.xml

@@ -130,19 +130,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from (select * from erm_patient_follow_up where is_del = 0 group by patient_appointment_id) epfu
         left join erm_patient_appointment epa on epfu.patient_appointment_id = epa.id
         left join erm_patient ep on epa.appointment_person_id = ep.id
-        <where>
-            and epa.is_del = 0 and ep.is_del = 0
+        where epa.is_del = 0 and ep.is_del = 0
             <if test="patientName != null and patientName != ''"> and ep.patient_name like concat('%', #{patientName}, '%')</if>
             <if test="followUpStatus != null and followUpStatus != ''"> and epfu.follow_up_status = #{followUpStatus}</if>
             <if test="followUpUser != null and followUpUser != ''"> and epfu.follow_up_user like concat('%', #{followUpUser}, '%')</if>
-
             <if test="followUpStartTime != null and followUpStartTime != ''"><!-- 开始时间检索 -->
                 and date_format(epfu.follow_up_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{followUpStartTime},'%Y-%m-%d %H:%i:%S')
             </if>
             <if test="followUpEndTime != null and followUpEndTime != ''"><!-- 结束时间检索 -->
                 and date_format(epfu.follow_up_time,'%Y-%m-%d %H:%i:%S') &lt;= date_format(#{followUpEndTime},'%Y-%m-%d %H:%i:%S')
             </if>
-        </where>
         ORDER BY epa.appointment_start_time DESC
     </select>
 </mapper>

eitc-patient-chat/src/main/java/com/eitc/patient/netty/server/ChatServer.java

@@ -15,7 +15,9 @@ import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.handler.stream.ChunkedWriteHandler;
 
 public class ChatServer {
-    private int port =8002;
+
+//    @Value("${websocket.port}")
+    private int port = 8002;
     public void start() throws Exception {
         //boss线程
         EventLoopGroup bossGroup = new NioEventLoopGroup();
@@ -66,14 +68,4 @@ public class ChatServer {
 
     }
 
-
-
-    public static void main(String[] args){
-        try {
-            new ChatServer().start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
 }

eitc-patient-pc/src/main/java/com/eitc/patient/controller/AppointmentProjectController.java

@@ -85,7 +85,7 @@ public class AppointmentProjectController extends BaseController {
                 .eq(StringUtils.isNotBlank(appointmentProject.getParentId()), AppointmentProject::getParentId, appointmentProject.getParentId())
                 .eq(StringUtils.isNotBlank(appointmentProject.getAppointmentName()), AppointmentProject::getAppointmentName, appointmentProject.getAppointmentName())
                 .orderByDesc(AppointmentProject::getUpdateDate);
-
+        eq.orderByDesc(AppointmentProject::getCreateDate);
         return appointmentProjectService.list(eq);
     }
 

eitc-patient-pc/src/main/java/com/eitc/patient/controller/DiagnosisManageController.java

@@ -0,0 +1,199 @@
+package com.eitc.patient.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.eitc.common.annotation.Log;
+import com.eitc.common.constant.HttpStatus;
+import com.eitc.common.core.controller.BaseController;
+import com.eitc.common.core.domain.AjaxResult;
+import com.eitc.common.core.page.TableDataInfo;
+import com.eitc.common.enums.BusinessType;
+import com.eitc.common.utils.PatientBaseUtil;
+import com.eitc.common.utils.poi.ExcelUtil;
+import com.eitc.patient.domain.DiagnosisManage;
+import com.eitc.patient.domain.DiagnosisTypeTemplate;
+import com.eitc.patient.excel.DiagnosisManageTemplateExcel;
+import com.eitc.patient.service.IDiagnosisManageService;
+import com.eitc.patient.service.IDiagnosisTypeTemplateService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * DiagnosisManageController
+ *
+ * @author mtx
+ * @date: 2024/05/17 15:51
+ */
+@Api(tags = "诊断管理")
+@RestController
+@RequestMapping("/diagnosis-manage")
+public class DiagnosisManageController extends BaseController {
+
+    @Resource
+    private IDiagnosisManageService diagnosisManageService;
+    @Resource
+    private IDiagnosisTypeTemplateService diagnosisTypeTemplateService;
+
+    /**
+     * 查询诊断管理
+     */
+    @GetMapping("/page")
+    @ApiOperation("查询诊断管理")
+    public TableDataInfo page(@ApiParam(name = "diagnosisParam", value = "搜索条件")
+                              @RequestParam(name = "diagnosisParam", required = false) String diagnosisParam) {
+        startPage();
+        LambdaQueryWrapper<DiagnosisManage> wrapper = Wrappers.lambdaQuery();
+        if (StringUtils.isNotBlank(diagnosisParam)) {
+            wrapper.like(DiagnosisManage::getDiagnosisName, diagnosisParam).or()
+                    .like(DiagnosisManage::getDiagnosisCode, diagnosisParam).or()
+                    .like(DiagnosisManage::getDiagnosisNamePinyin, diagnosisParam).or()
+                    .like(DiagnosisManage::getDiagnosisNamePinyinFirstLetter, diagnosisParam);
+        }
+        wrapper.orderByDesc(DiagnosisManage::getCreateDate);
+        List<DiagnosisManage> manageList = diagnosisManageService.list(wrapper);
+
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("10087");
+        rspData.setRows(manageList);
+        rspData.setTotal(new PageInfo(manageList).getTotal());
+        return rspData;
+    }
+
+    /**
+     * 获取诊断管理详细信息
+     */
+    @GetMapping(value = "/detail")
+    @ApiOperation("获取诊断管理详细信息")
+    public AjaxResult detail(String id) {
+        return success(diagnosisManageService.getById(id));
+    }
+
+    /**
+     * 新增诊断管理
+     */
+    @Log(title = "新增诊断管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("新增诊断管理")
+    public AjaxResult add(@Valid @RequestBody DiagnosisManage diagnosisManage) {
+        checkSaveDiagnosisManage(diagnosisManage);
+        // 首拼
+        diagnosisManage.setDiagnosisNamePinyinFirstLetter(PatientBaseUtil.getPinYinFirstLetter(diagnosisManage.getDiagnosisName()));
+        diagnosisManage.setDiagnosisNamePinyin(PatientBaseUtil.getPinyin(diagnosisManage.getDiagnosisName()));
+        return toAjax(diagnosisManageService.save(diagnosisManage));
+    }
+
+    /**
+     * 修改诊断管理
+     */
+    @Log(title = "修改诊断管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    @ApiOperation("修改诊断管理")
+    public AjaxResult edit(@Valid @RequestBody DiagnosisManage diagnosisManage) {
+        checkSaveDiagnosisManage(diagnosisManage);
+        // 首拼
+        diagnosisManage.setDiagnosisNamePinyinFirstLetter(PatientBaseUtil.getPinYinFirstLetter(diagnosisManage.getDiagnosisName()));
+        diagnosisManage.setDiagnosisNamePinyin(PatientBaseUtil.getPinyin(diagnosisManage.getDiagnosisName()));
+        return toAjax(diagnosisManageService.updateById(diagnosisManage));
+    }
+
+    /**
+     * 导入诊断分类模板
+     *
+     * @param file 文件
+     */
+    @Log(title = "导入诊断分类模板", businessType = BusinessType.INSERT)
+    @PostMapping("/importTemplate")
+    @ApiOperation("导入诊断分类模板")
+    public void importTemplate(@RequestParam("file") @ApiParam(name = "file", value = "上传文件") MultipartFile file, HttpServletResponse response) throws IOException {
+        // 1.解析excel
+        ExcelUtil<DiagnosisManageTemplateExcel> util = new ExcelUtil<>(DiagnosisManageTemplateExcel.class);
+        List<DiagnosisManageTemplateExcel> list = util.importExcel(file.getInputStream());
+        // 2.如果解析数据为空则返回错误信息
+        if (CollectionUtils.isEmpty(list)) {
+            throw new RuntimeException("上传数据为空，请填写");
+        }
+        // 解析模板
+        List<DiagnosisManageTemplateExcel> diagnosisManageTemplateExcels = diagnosisManageService.importTemplate(list);
+        // 导出错误模板
+        if (CollectionUtils.isNotEmpty(diagnosisManageTemplateExcels)) {
+            util.exportExcel(response, diagnosisManageTemplateExcels, "模板错误");
+        }
+    }
+
+    /**
+     * 删除诊断管理
+     */
+    @Log(title = "删除诊断管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/remove")
+    @ApiOperation("删除诊断管理")
+    public AjaxResult remove(String id) {
+        checkDelDiagnosisManage(id);
+        return toAjax(diagnosisManageService.removeById(id));
+    }
+
+    /**
+     * 检查诊断管理对象的诊断编码和诊断名称是否重复
+     * 此方法通过查询数据库中是否存在相同的诊断编码或诊断名称来确保数据的唯一性
+     * 如果发现重复，将抛出IllegalArgumentException异常
+     *
+     * @param diagnosisManage 待检查的诊断管理对象
+     * @throws IllegalArgumentException 如果诊断编码或诊断名称重复，则抛出此异常
+     */
+    private void checkSaveDiagnosisManage(DiagnosisManage diagnosisManage) {
+        // 查询数据库中是否有与提供的诊断编码相同的记录
+        long diagnosisCodeCount = diagnosisManageService.count(Wrappers.<DiagnosisManage>lambdaQuery()
+                .ne(StringUtils.isNotBlank(diagnosisManage.getId()), DiagnosisManage::getId, diagnosisManage.getId())
+                .eq(DiagnosisManage::getDiagnosisCode, diagnosisManage.getDiagnosisCode()));
+        // 如果诊断编码重复，则抛出异常
+        if (diagnosisCodeCount > 0) {
+            throw new IllegalArgumentException("诊断编码重复");
+        }
+        // 查询数据库中是否有与提供的诊断名称相同的记录
+        long diagnosisNameCount = diagnosisManageService.count(Wrappers.<DiagnosisManage>lambdaQuery()
+                .ne(StringUtils.isNotBlank(diagnosisManage.getId()), DiagnosisManage::getId, diagnosisManage.getId())
+                .eq(DiagnosisManage::getDiagnosisName, diagnosisManage.getDiagnosisName()));
+        // 如果诊断名称重复，则抛出异常
+        if (diagnosisNameCount > 0) {
+            throw new IllegalArgumentException("诊断名称重复");
+        }
+    }
+
+    /**
+     * 检查并处理删除诊断管理信息前的准备工作
+     *
+     * @param id 待删除的诊断管理信息的ID
+     * @throws IllegalArgumentException 如果id为空，则抛出此异常
+     */
+    private void checkDelDiagnosisManage(String id) {
+        // 检查ID是否为空，如果为空则抛出异常，提示id不能为空
+        if (StringUtils.isEmpty(id)) {
+            throw new IllegalArgumentException("id不能为空");
+        }
+        long count = diagnosisTypeTemplateService.count(Wrappers.<DiagnosisTypeTemplate>lambdaQuery()
+                .eq(DiagnosisTypeTemplate::getDiagnosisManageId, id));
+        if (count > 0) {
+            throw new IllegalArgumentException("该诊断管理已被使用，无法删除");
+        }
+    }
+
+}

eitc-patient-pc/src/main/java/com/eitc/patient/controller/DiagnosisTypeController.java

@@ -5,6 +5,7 @@ import com.eitc.common.annotation.Log;
 import com.eitc.common.core.controller.BaseController;
 import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.enums.BusinessType;
+import com.eitc.common.utils.PatientBaseUtil;
 import com.eitc.common.utils.bean.BeanUtils;
 import com.eitc.patient.domain.DiagnosisType;
 import com.eitc.patient.domain.DiagnosisTypeTemplate;
@@ -29,6 +30,7 @@ import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * DiagnosisTypeController
@@ -109,6 +111,18 @@ public class DiagnosisTypeController extends BaseController {
         if (count > 0) {
             return error("不允许添加子集");
         }
+        DiagnosisType type = diagnosisTypeService.getById(diagnosisType.getParentId());
+        if (Objects.nonNull(type)) {
+            if(StringUtils.isNotBlank(type.getAncestors()) && type.getAncestors().split(",").length > 4){
+                return error("不允许继续添加子集");
+            }
+            diagnosisType.setAncestors(type.getAncestors() + "," + diagnosisType.getParentId());
+        } else {
+            diagnosisType.setAncestors(diagnosisType.getParentId());
+        }
+        // 首拼
+        diagnosisType.setDiagnosisNamePinyinFirstLetter(PatientBaseUtil.getPinYinFirstLetter(diagnosisType.getDiagnosisName()));
+        diagnosisType.setDiagnosisNamePinyin(PatientBaseUtil.getPinyin(diagnosisType.getDiagnosisName()));
         return toAjax(diagnosisTypeService.save(diagnosisType));
     }
 
@@ -119,6 +133,9 @@ public class DiagnosisTypeController extends BaseController {
     @PutMapping
     @ApiOperation("修改诊断分类")
     public AjaxResult edit(@ApiParam(name = "diagnosisType") @Valid @RequestBody DiagnosisType diagnosisType) {
+        // 首拼
+        diagnosisType.setDiagnosisNamePinyinFirstLetter(PatientBaseUtil.getPinYinFirstLetter(diagnosisType.getDiagnosisName()));
+        diagnosisType.setDiagnosisNamePinyin(PatientBaseUtil.getPinyin(diagnosisType.getDiagnosisName()));
         return toAjax(diagnosisTypeService.updateById(diagnosisType));
     }
 

eitc-patient-pc/src/main/java/com/eitc/patient/controller/DiagnosisTypeOrderDoctorController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -48,8 +49,8 @@ public class DiagnosisTypeOrderDoctorController extends BaseController {
 
     @GetMapping("/tree")
     @ApiOperation("查询诊断分类")
-    public AjaxResult tree() {
-        return success(diagnosisTypeService.findTreeList());
+    public AjaxResult tree(@RequestParam(name = "searchParam", required = false) String searchParam, @RequestParam(name = "visitType", required = false) String visitType) {
+        return success(diagnosisTypeService.findTreeList(searchParam, visitType));
     }
 
 }

eitc-patient-pc/src/main/java/com/eitc/patient/controller/DiagnosisTypeTemplateController.java

@@ -6,23 +6,18 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.eitc.common.annotation.Log;
 import com.eitc.common.core.controller.BaseController;
 import com.eitc.common.core.domain.AjaxResult;
+import com.eitc.common.core.page.TableDataInfo;
 import com.eitc.common.enums.BusinessType;
 import com.eitc.common.utils.bean.BeanUtils;
 import com.eitc.common.utils.poi.ExcelUtil;
-import com.eitc.patient.domain.DiagnosisType;
 import com.eitc.patient.domain.DiagnosisTypeTemplate;
-import com.eitc.patient.dto.DiagnosisTypeTemplateDto;
-import com.eitc.patient.enums.DiagnosisTypeTemplateReviewStatusEnum;
-import com.eitc.patient.enums.MedicalHistoryDiseaseTypeEnum;
 import com.eitc.patient.excel.DiagnosisTypeTemplateExcel;
-import com.eitc.patient.service.IDiagnosisTypeService;
 import com.eitc.patient.service.IDiagnosisTypeTemplateService;
-import com.eitc.patient.service.IMedicalHistoryService;
 import com.eitc.patient.vo.DiagnosisTypeTemplateSaveVO;
 import com.eitc.patient.vo.DiagnosisTypeTemplateVO;
+import com.eitc.system.utils.UserCacheUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,6 +33,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -56,64 +52,75 @@ public class DiagnosisTypeTemplateController extends BaseController {
 
     @Resource
     private IDiagnosisTypeTemplateService diagnosisTypeTemplateService;
-    @Resource
-    private IDiagnosisTypeService diagnosisTypeService;
-    @Resource
-    private IMedicalHistoryService medicalHistoryService;
+
 
     /**
      * 查询诊断分类模板
      */
-    @GetMapping("/list")
+    @GetMapping("/page")
     @ApiOperation("查询诊断分类模板")
-    public AjaxResult list(DiagnosisTypeTemplate diagnosisTypeTemplate) {
+    public TableDataInfo page(DiagnosisTypeTemplate diagnosisTypeTemplate) {
+        startPage();
         LambdaQueryWrapper<DiagnosisTypeTemplate> eq = Wrappers.<DiagnosisTypeTemplate>lambdaQuery()
-                .like(Objects.nonNull(diagnosisTypeTemplate.getDiagnosisTypeId()), DiagnosisTypeTemplate::getDiagnosisTypeId, diagnosisTypeTemplate.getDiagnosisTypeId())
-                .like(StringUtils.isNotBlank(diagnosisTypeTemplate.getTemplateName()), DiagnosisTypeTemplate::getTemplateName, diagnosisTypeTemplate.getTemplateName())
-                .like(StringUtils.isNotBlank(diagnosisTypeTemplate.getTemplateExample()), DiagnosisTypeTemplate::getTemplateExample, diagnosisTypeTemplate.getTemplateExample())
-                .orderByAsc(DiagnosisTypeTemplate::getOrderNum);
+                .like(Objects.nonNull(diagnosisTypeTemplate.getDiagnosisTypeId()),
+                        DiagnosisTypeTemplate::getDiagnosisTypeId, diagnosisTypeTemplate.getDiagnosisTypeId())
+                .orderByDesc(DiagnosisTypeTemplate::getCreateDate);
+        List<DiagnosisTypeTemplate> list = diagnosisTypeTemplateService.list(eq);
+        List<DiagnosisTypeTemplateVO> voList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (DiagnosisTypeTemplate template : list) {
+                voList.add(getDiagnosisTypeTemplateVO(template));
+            }
+        }
 
-        return success(diagnosisTypeTemplateService.list(eq));
+        return getDataTable(voList);
     }
 
-
-    @GetMapping("/listToPatientId")
-    @ApiOperation("查询诊断分类模板")
-    public AjaxResult listToPatientId(String patientId, String diagnosisTypeId) {
-        LambdaQueryWrapper<DiagnosisTypeTemplate> eq = Wrappers.<DiagnosisTypeTemplate>lambdaQuery()
-                .eq(DiagnosisTypeTemplate::getDiagnosisTypeId, diagnosisTypeId)
-                .orderByAsc(DiagnosisTypeTemplate::getOrderNum);
-
-        List<DiagnosisTypeTemplate> list = diagnosisTypeTemplateService.list(eq);
-        if (CollectionUtils.isEmpty(list)) {
-            return error("请先配置诊断分类模板");
-        }
-        // 封装模板信息
-        List<DiagnosisTypeTemplateDto> collect = list.stream().map(li -> {
-            DiagnosisTypeTemplateDto dto = new DiagnosisTypeTemplateDto();
-            BeanUtils.copyProperties(li, dto);
-            dto.setTemplateExample2(dto.getTemplateExample());
-            if (MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getInfo().equals(li.getTemplateName())) {
-                medicalHistoryService.findMedicalHistory(patientId, MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getCode(), dto);
-            }
-            if (MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getInfo().equals(li.getTemplateName())) {
-                medicalHistoryService.findMedicalHistory(patientId, MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getCode(), dto);
+    /**
+     * 根据诊断类型模板对象创建诊断类型模板VO对象
+     * 主要用于展示诊断类型的详细信息，包括适用的部门名称
+     *
+     * @param template 诊断类型模板对象
+     * @return 创建的诊断类型模板VO对象
+     */
+    private static DiagnosisTypeTemplateVO getDiagnosisTypeTemplateVO(DiagnosisTypeTemplate template) {
+        // 初始化诊断类型模板VO对象
+        DiagnosisTypeTemplateVO item = new DiagnosisTypeTemplateVO();
+        // 将模板对象的属性复制到VO对象
+        BeanUtils.copyProperties(template, item);
+        // 获取模板适用的部门ID字符串
+        String applyDept = template.getApplyDept();
+        // 检查适用部门信息是否非空
+        if (StringUtils.isNotBlank(applyDept)) {
+            // 初始化部门名称列表
+            List<String> deptNameList = new ArrayList<>();
+            // 将适用部门ID字符串分割为数组
+            String[] deptIds = applyDept.split(",");
+            // 遍历部门ID数组，获取每个部门的名称
+            for (String deptId : deptIds) {
+                deptNameList.add(UserCacheUtil.getSysDeptById(deptId).getDeptName());
             }
-            if (MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getInfo().equals(li.getTemplateName())) {
-                medicalHistoryService.findMedicalHistory(patientId, MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getCode(), dto);
+            // 将部门名称列表转换为逗号分隔的字符串，并设置到VO对象
+            item.setApplyDept(String.join(",", deptNameList));
+            // 再次检查适用部门信息是否非空，实际上此处的判断是多余的，因为已经在上面判断过一次
+            // 这里可能是代码的重复检查，或者是出于代码风格的考虑，保持对适用部门非空性的强调
+            if (StringUtils.isNotBlank(applyDept)) {
+                // 将适用部门ID列表设置到VO对象
+                item.setApplyDeptList(Arrays.stream(deptIds).map(Long::valueOf).collect(Collectors.toList()));
             }
-            return dto;
-        }).collect(Collectors.toList());
-        return success(collect);
+        }
+        // 返回创建的诊断类型模板VO对象
+        return item;
     }
 
+
     /**
      * 获取诊断分类模板详细信息
      */
     @GetMapping(value = "/detail")
     @ApiOperation("获取诊断分类模板详细信息")
     public AjaxResult detail(String id) {
-        return success(diagnosisTypeTemplateService.getById(id));
+        return success(getDiagnosisTypeTemplateVO(diagnosisTypeTemplateService.getById(id)));
     }
 
     /**
@@ -122,21 +129,9 @@ public class DiagnosisTypeTemplateController extends BaseController {
     @Log(title = "新增诊断分类模板", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增诊断分类模板")
-    public AjaxResult add(@ApiParam(value = "entry") @Valid @RequestBody DiagnosisTypeTemplateSaveVO entry) {
-        List<DiagnosisTypeTemplateVO> diagnosisTypeTemplateList = entry.getDiagnosisTypeTemplateList();
-        if (CollectionUtils.isEmpty(diagnosisTypeTemplateList)) {
-            return error("诊断模板为空");
-        }
-        String diagnosisTypeId = entry.getDiagnosisTypeId();
-        if (StringUtils.isBlank(diagnosisTypeId)) {
-            return error("必填项不能为空");
-        }
-        long typeCount = diagnosisTypeService.count(Wrappers.<DiagnosisType>lambdaQuery().eq(DiagnosisType::getParentId, diagnosisTypeId));
-        if (typeCount > 0) {
-            return error("存在子类型，不允许添加模板");
-        }
-        diagnosisTypeTemplateService.remove(Wrappers.<DiagnosisTypeTemplate>lambdaQuery().eq(DiagnosisTypeTemplate::getDiagnosisTypeId, diagnosisTypeId));
-        return toAjax(diagnosisTypeTemplateService.add(entry));
+    public AjaxResult add(@Valid @RequestBody DiagnosisTypeTemplateSaveVO entry) {
+        diagnosisTypeTemplateService.add(entry);
+        return success();
     }
 
     /**
@@ -148,19 +143,18 @@ public class DiagnosisTypeTemplateController extends BaseController {
     @Log(title = "导入诊断分类模板", businessType = BusinessType.INSERT)
     @PostMapping("/importTemplate")
     @ApiOperation("导入诊断分类模板")
-    public void importTemplate(@RequestParam("file") @ApiParam(name = "file", value = "上传文件") MultipartFile file, String diagnosisTypeId, HttpServletResponse response) throws IOException {
-        if (StringUtils.isBlank(diagnosisTypeId)) {
-            throw new IllegalArgumentException("必填项不能为空");
-        }
-        long typeCount = diagnosisTypeService.count(Wrappers.<DiagnosisType>lambdaQuery().eq(DiagnosisType::getParentId, diagnosisTypeId));
-        if (typeCount > 0) {
-            throw new IllegalArgumentException("存在子类型，不允许添加模板");
+    public void importTemplate(@RequestParam("file") MultipartFile file, String diagnosisTypeId, HttpServletResponse response) throws IOException {
+        // 1.解析excel
+        ExcelUtil<DiagnosisTypeTemplateExcel> util = new ExcelUtil<>(DiagnosisTypeTemplateExcel.class);
+        List<DiagnosisTypeTemplateExcel> list = util.importExcel(file.getInputStream());
+        // 2.如果解析数据为空则返回错误信息
+        if (CollectionUtils.isEmpty(list)) {
+            throw new RuntimeException("上传数据为空，请填写");
         }
         // 解析模板
-        List<DiagnosisTypeTemplateExcel> diagnosisTypeTemplateExcels = diagnosisTypeTemplateService.importTemplate(file, diagnosisTypeId);
+        List<DiagnosisTypeTemplateExcel> diagnosisTypeTemplateExcels = diagnosisTypeTemplateService.importTemplate(list, diagnosisTypeId);
         // 导出错误模板
         if (CollectionUtils.isNotEmpty(diagnosisTypeTemplateExcels)) {
-            ExcelUtil<DiagnosisTypeTemplateExcel> util = new ExcelUtil<>(DiagnosisTypeTemplateExcel.class);
             util.exportExcel(response, diagnosisTypeTemplateExcels, "模板错误");
         }
     }
@@ -171,14 +165,9 @@ public class DiagnosisTypeTemplateController extends BaseController {
     @Log(title = "修改诊断分类模板", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改诊断分类模板")
-    public AjaxResult edit(@Valid @RequestBody DiagnosisTypeTemplate diagnosisTypeTemplate) {
-        String templateExample = diagnosisTypeTemplate.getTemplateExample();
-        if (StringUtils.isNotBlank(templateExample)) {
-            diagnosisTypeTemplate.setTemplateOption(diagnosisTypeTemplateService.findTemplateOptionJson(templateExample));
-            diagnosisTypeTemplate.setTemplateInfo(diagnosisTypeTemplateService.findTemplateInfo(templateExample));
-        }
-        diagnosisTypeTemplate.setReviewStatus(DiagnosisTypeTemplateReviewStatusEnum.ALREADY_AUDITING.getCode());
-        return toAjax(diagnosisTypeTemplateService.updateById(diagnosisTypeTemplate));
+    public AjaxResult edit(@Valid @RequestBody DiagnosisTypeTemplateSaveVO entry) {
+        diagnosisTypeTemplateService.edit(entry);
+        return success();
     }
 
     /**

eitc-patient-pc/src/main/java/com/eitc/patient/controller/MedicalRecordController.java

@@ -1,5 +1,6 @@
 package com.eitc.patient.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,24 +15,33 @@ import com.eitc.common.enums.BusinessType;
 import com.eitc.common.utils.PatientBaseUtil;
 import com.eitc.common.utils.PdfUtil;
 import com.eitc.common.utils.bean.BeanUtils;
-import com.eitc.patient.domain.DiagnosisType;
+import com.eitc.patient.domain.DiagnosisManage;
+import com.eitc.patient.domain.DiagnosisTypeTemplate;
+import com.eitc.patient.domain.MedicalHistory;
 import com.eitc.patient.domain.MedicalRecord;
 import com.eitc.patient.domain.MedicalRecordDetails;
 import com.eitc.patient.domain.Patient;
 import com.eitc.patient.domain.ProtocolTemplate;
-import com.eitc.patient.dto.MedicalRecordDto;
+import com.eitc.patient.dto.DiagnosisTypeTemplateDto;
 import com.eitc.patient.dto.MedicalRecordHistoryDto;
 import com.eitc.patient.dto.MedicalRecordListDto;
 import com.eitc.patient.dto.PatientTeethInfoDto;
-import com.eitc.patient.service.IDiagnosisTypeService;
+import com.eitc.patient.enums.MedicalHistoryDiseaseSourceEnum;
+import com.eitc.patient.enums.MedicalHistoryDiseaseTypeEnum;
+import com.eitc.patient.param.MedicalRecordListParam;
+import com.eitc.patient.param.MedicalRecordParam;
+import com.eitc.patient.param.MedicalRecordSaveParam;
+import com.eitc.patient.service.IDiagnosisManageService;
+import com.eitc.patient.service.IDiagnosisTypeTemplateService;
+import com.eitc.patient.service.IMedicalHistoryService;
 import com.eitc.patient.service.IMedicalRecordDetailsService;
 import com.eitc.patient.service.IMedicalRecordService;
 import com.eitc.patient.service.IPatientService;
 import com.eitc.patient.service.IProtocolTemplateService;
-import com.eitc.patient.utils.PatientUtil;
-import com.eitc.patient.vo.MedicalRecordDetailsVO;
-import com.eitc.patient.vo.MedicalRecordParamVO;
-import com.eitc.patient.vo.MedicalRecordTemplateVO;
+import com.eitc.patient.vo.MedicalRecordListVO;
+import com.eitc.patient.vo.MedicalRecordNoteVO;
+import com.eitc.patient.vo.MedicalRecordToPdf;
+import com.eitc.patient.vo.MedicalRecordToothVO;
 import com.eitc.system.utils.UserCacheUtil;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -62,7 +72,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -86,9 +95,13 @@ public class MedicalRecordController extends BaseController {
     @Resource
     private IMedicalRecordDetailsService medicalRecordDetailsService;
     @Resource
-    private IPatientService patientService;
+    private IMedicalHistoryService medicalHistoryService;
+    @Resource
+    private IDiagnosisTypeTemplateService diagnosisTypeTemplateService;
     @Resource
-    private IDiagnosisTypeService diagnosisTypeService;
+    private IDiagnosisManageService diagnosisManageService;
+    @Resource
+    private IPatientService patientService;
     @Resource
     private IProtocolTemplateService protocolTemplateService;
 
@@ -107,21 +120,7 @@ public class MedicalRecordController extends BaseController {
      */
     @PostMapping(value = "/html2Pdf")
     @ApiOperation("打印病历")
-    public void html2Pdf(@RequestBody MedicalRecordTemplateVO vo, HttpServletResponse response) throws IOException, TemplateException {
-        // 过滤出标记为需要包含在PDF中的病历细节。
-        Map<String, List<MedicalRecordDetailsVO>> listMap = vo.getListMap();
-        for (String s : listMap.keySet()) {
-            List<MedicalRecordDetailsVO> vos = listMap.get(s);
-            if (CollectionUtils.isEmpty(vos)) {
-                continue;
-            }
-            List<MedicalRecordDetailsVO> collect = vos.stream().filter(MedicalRecordDetailsVO::isFlagCheck).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(collect)) {
-                collect.forEach(li -> li.setToothPosition(PatientUtil.initToothPosition(li.getToothPosition())));
-            }
-            listMap.put(s, collect);
-        }
-
+    public void html2Pdf(@RequestBody MedicalRecordToPdf vo, HttpServletResponse response) throws IOException, TemplateException {
         // 准备Freemarker模板渲染所需的参数。
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("companyName", UserCacheUtil.getClinicName() + "口腔科病历");
@@ -157,7 +156,7 @@ public class MedicalRecordController extends BaseController {
     @GetMapping("/findMedicalInfo")
     @ApiOperation("打印病历详情")
     public AjaxResult findMedicalInfo(String medicalRecordId, String protocolTemplateId) throws ParseException {
-        MedicalRecordTemplateVO mrt = new MedicalRecordTemplateVO();
+        MedicalRecordToPdf mrt = new MedicalRecordToPdf();
         // 根据病历ID查询病历信息
         MedicalRecord medicalRecord = medicalRecordService.getById(medicalRecordId);
         // 检查病历是否存在
@@ -173,41 +172,25 @@ public class MedicalRecordController extends BaseController {
                 // 根据身份证号计算患者年龄
                 mrt.setAge(PatientBaseUtil.findAge(patient.getIdentificationCard()));
             }
-            // 根据病历ID查询病历详情列表
-            List<MedicalRecordDetailsVO> list = medicalRecordDetailsService.findMedicalRecordDetailsVOByMedicalRecordId(medicalRecordId);
-            // 根据模板名称分组聚合病历详情
-            Map<String, List<MedicalRecordDetailsVO>> collect = list.stream().collect(Collectors.groupingBy(MedicalRecordDetailsVO::getTemplateName));
-            // 使用LinkedHashMap保持插入顺序
-            Map<String, List<MedicalRecordDetailsVO>> linkedMap = new LinkedHashMap<>();
-            // 遍历诊断类型模板键列表
-            for (String s : PatientUtil.diagnosisTypeTemplateKeyList()) {
-                // 对特定的模板类型进行处理
-                if ("主诉".equals(s) || "现病史".equals(s) || "既往史".equals(s) || "家族史".equals(s) || "过敏史".equals(s)) {
-                    List<MedicalRecordDetailsVO> vos = collect.get(s);
-                    // 检查是否存在对应的病历详情
-                    if (CollectionUtils.isNotEmpty(vos)) {
-                        MedicalRecordDetailsVO vo = vos.get(0);
-                        // 对既往史、家族史、过敏史进行格式化处理
-                        if ("既往史".equals(s) || "家族史".equals(s) || "过敏史".equals(s)) {
-                            if (Objects.nonNull(vo.getFormattedPartsList())) {
-                                vo.setContentInfo(String.join(",", vo.getFormattedPartsList()));
-                            } else {
-                                vo.setContentInfo("");
-                            }
-                        }
-                        // 将处理后的病历详情添加到linkedMap中
-                        linkedMap.put(s, Collections.singletonList(vo));
-                    } else {
-                        // 如果不存在对应的病历详情，则添加空列表
-                        linkedMap.put(s, new ArrayList<>());
-                    }
-                } else {
-                    // 对其他模板类型，直接添加到linkedMap中
-                    linkedMap.put(s, collect.get(s));
-                }
+
+            mrt.setChiefComplaintContent(medicalRecord.getChiefComplaintContent());
+            mrt.setPresentIllnessContent(medicalRecord.getPresentIllnessContent());
+            mrt.setInspectContent(medicalRecord.getInspectContent());
+            mrt.setTreatmentPlanningContent(medicalRecord.getTreatmentPlanningContent());
+            mrt.setDisposeContent(medicalRecord.getDisposeContent());
+            mrt.setDiagnosisContent(medicalRecord.getDiagnosisContent());
+            mrt.setNoteContent(medicalRecord.getNoteContent());
+
+            List<MedicalHistory> histories = medicalHistoryService.list(Wrappers.<MedicalHistory>lambdaQuery().eq(MedicalHistory::getPatientId, patientId));
+
+            if (CollectionUtils.isNotEmpty(histories)) {
+                mrt.setAllergyHistory(histories.stream().filter(l -> MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getCode().equals(l.getDiseaseType()))
+                        .map(MedicalHistory::getDiseaseContent).collect(Collectors.joining(",")));
+                mrt.setPastHistory(histories.stream().filter(l -> MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getCode().equals(l.getDiseaseType()))
+                        .map(MedicalHistory::getDiseaseContent).collect(Collectors.joining(",")));
+                mrt.setFamilyHistory(histories.stream().filter(l -> MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getCode().equals(l.getDiseaseType()))
+                        .map(MedicalHistory::getDiseaseContent).collect(Collectors.joining(",")));
             }
-            // 设置处理后的病历详情列表到病历模板VO中
-            mrt.setListMap(linkedMap);
         }
         mrt.setCompanyName(UserCacheUtil.getClinicName() + "口腔科病历");
 
@@ -224,7 +207,7 @@ public class MedicalRecordController extends BaseController {
      */
     @GetMapping("/list")
     @ApiOperation("查询病历")
-    public AjaxResult list(MedicalRecordDto medicalRecord) {
+    public AjaxResult list(MedicalRecordListParam medicalRecord) {
         LambdaQueryWrapper<MedicalRecord> wrapper = Wrappers.<MedicalRecord>lambdaQuery()
                 .eq(MedicalRecord::getPatientId, medicalRecord.getPatientId())
                 .orderByDesc(MedicalRecord::getCreateDate);
@@ -234,13 +217,15 @@ public class MedicalRecordController extends BaseController {
             LocalDateTime dateTime = LocalDateTime.now().minusMonths(queryScope);
             wrapper.ge(MedicalRecord::getCreateDate, dateTime);
         }
-        List<MedicalRecordParamVO> voList = new ArrayList<>();
         List<MedicalRecord> list = medicalRecordService.list(wrapper);
-        if (Objects.nonNull(list)) {
+
+        List<MedicalRecordListVO> voList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list)) {
             for (MedicalRecord record : list) {
-                voList.add(medicalRecordService.getMedicalRecordVO(record));
+                voList.add(getMedicalRecordListVO(record));
             }
         }
+
         return success(voList);
     }
 
@@ -251,7 +236,52 @@ public class MedicalRecordController extends BaseController {
     @ApiOperation("获取病历详细信息")
     public AjaxResult detail(String id) {
         MedicalRecord medicalRecord = medicalRecordService.getById(id);
-        return success(medicalRecordService.getMedicalRecordVO(medicalRecord));
+        return success(getMedicalRecordListVO(medicalRecord));
+    }
+
+
+    /**
+     * 根据病历对象构建病历列表视图对象
+     *
+     * @param medicalRecord 病历对象，用于从数据库中查询相关的病史信息
+     * @return MedicalRecordListVO 返回填充了病史信息的病历列表视图对象
+     */
+    private MedicalRecordListVO getMedicalRecordListVO(MedicalRecord medicalRecord) {
+        MedicalRecordListVO vo = new MedicalRecordListVO();
+        BeanUtils.copyProperties(medicalRecord, vo);
+
+        // 根据病历ID查询相关的病史信息，并根据类型进行处理
+        List<MedicalHistory> histories = medicalHistoryService.list(Wrappers.<MedicalHistory>lambdaQuery()
+                .eq(MedicalHistory::getMedicalRecordId, medicalRecord.getId()));
+        if (CollectionUtils.isNotEmpty(histories)) {
+            // 处理医生记录的病史
+            vo.setDoctorAllergyHistory(histories.stream()
+                    .filter(l -> MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getCode().equals(l.getDiseaseType()))
+                    .map(MedicalHistory::getDiseaseContent).collect(Collectors.toList()));
+            vo.setDoctorFamilyHistory(histories.stream()
+                    .filter(l -> MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getCode().equals(l.getDiseaseType()))
+                    .map(MedicalHistory::getDiseaseContent).collect(Collectors.toList()));
+            vo.setDoctorPastHistory(histories.stream()
+                    .filter(l -> MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getCode().equals(l.getDiseaseType()))
+                    .map(MedicalHistory::getDiseaseContent).collect(Collectors.toList()));
+
+            // 处理病人自述的病史
+            List<MedicalHistory> patientMedicalHistory = histories.stream()
+                    .filter(l -> MedicalHistoryDiseaseSourceEnum.PATIENT.getCode().equals(l.getDiseaseSource())).collect(Collectors.toList());
+            vo.setPatientAllergyHistory(patientMedicalHistory.stream()
+                    .filter(l -> MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getCode().equals(l.getDiseaseType()))
+                    .map(MedicalHistory::getDiseaseContent).collect(Collectors.toList()));
+            vo.setPatientFamilyHistory(patientMedicalHistory.stream()
+                    .filter(l -> MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getCode().equals(l.getDiseaseType()))
+                    .map(MedicalHistory::getDiseaseContent).collect(Collectors.toList()));
+            vo.setPatientPastHistory(patientMedicalHistory.stream()
+                    .filter(l -> MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getCode().equals(l.getDiseaseType()))
+                    .map(MedicalHistory::getDiseaseContent).collect(Collectors.toList()));
+        }
+
+        vo.setRecordDetailsList(medicalRecordDetailsService.list(Wrappers.<MedicalRecordDetails>lambdaQuery()
+                .eq(MedicalRecordDetails::getMedicalRecordId, medicalRecord.getId())));
+        return vo;
     }
 
     /**
@@ -260,11 +290,8 @@ public class MedicalRecordController extends BaseController {
     @Log(title = "新增病历", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增病历")
-    public AjaxResult add(@Valid @RequestBody MedicalRecordParamVO vo) {
-        if (CollectionUtils.isEmpty(vo.getDataList())) {
-            return error("无数据");
-        }
-        medicalRecordService.addOrEdit(vo);
+    public AjaxResult add(@Valid @RequestBody MedicalRecordSaveParam param) {
+        medicalRecordService.addOrEdit(param);
         return success();
     }
 
@@ -274,14 +301,11 @@ public class MedicalRecordController extends BaseController {
     @Log(title = "修改病历", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改病历")
-    public AjaxResult edit(@Valid @RequestBody MedicalRecordParamVO vo) {
-        if (StringUtils.isEmpty(vo.getId())) {
+    public AjaxResult edit(@Valid @RequestBody MedicalRecordSaveParam param) {
+        if (StringUtils.isEmpty(param.getId())) {
             return error();
         }
-        if (CollectionUtils.isEmpty(vo.getDataList())) {
-            return error("无数据");
-        }
-        medicalRecordService.addOrEdit(vo);
+        medicalRecordService.addOrEdit(param);
         return success();
     }
 
@@ -353,9 +377,9 @@ public class MedicalRecordController extends BaseController {
                     dto.setMedicalRecordDetailsId(medicalRecordDetails.getId());
 
                     // 根据医疗记录详情中的诊断类型ID，查询并设置诊断类型名称
-                    DiagnosisType diagnosisType = diagnosisTypeService.getById(medicalRecordDetails.getDiagnosisTypeId());
-                    if (Objects.nonNull(diagnosisType)) {
-                        dto.setDiagnosisTypeName(diagnosisType.getDiagnosisName());
+                    DiagnosisManage manage = diagnosisManageService.getById(medicalRecordDetails.getDiagnosisManageId());
+                    if (Objects.nonNull(manage)) {
+                        dto.setDiagnosisTypeName(manage.getDiagnosisName());
                     }
 
                     // 设置医疗记录的创建日期
@@ -372,7 +396,7 @@ public class MedicalRecordController extends BaseController {
 
 
     @GetMapping("/medical-record-list")
-    @ApiOperation("查询病历列表")
+    @ApiOperation("就诊记录-查询病历列表")
     public TableDataInfo medicalRecordList(@RequestParam(name = "searchParam", required = false) String searchParam) {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
@@ -388,25 +412,93 @@ public class MedicalRecordController extends BaseController {
         MedicalRecordHistoryDto dto = new MedicalRecordHistoryDto();
         dto.setPatientId(patientId);
         dto.setToothPositionList(Collections.singletonList(toothPosition));
-        List<MedicalRecord> list = medicalRecordDetailsService.findListByToothPosition(dto);
+        List<MedicalRecord> list = medicalRecordService.findListByToothPosition(dto);
         return success(Objects.nonNull(list) && list.size() > 0);
     }
 
     @PostMapping("/findListByToothPosition")
-    @ApiOperation("通过牙位获取病历列表")
+    @ApiOperation("历史病例")
     public AjaxResult findListByToothPosition(@RequestBody MedicalRecordHistoryDto dto) {
-        List<MedicalRecordParamVO> voList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(dto.getToothPositionList())) {
-            List<MedicalRecord> list = medicalRecordDetailsService.findListByToothPosition(dto);
-            if (Objects.nonNull(list)) {
-                for (MedicalRecord record : list) {
-                    voList.add(medicalRecordService.getMedicalRecordVO(record));
+        List<MedicalRecord> list = medicalRecordService.findListByToothPosition(dto);
+        List<MedicalRecordListVO> voList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (MedicalRecord record : list) {
+                voList.add(getMedicalRecordListVO(record));
+            }
+        }
+        return success(voList);
+    }
+
+    @PostMapping("/findNoteList")
+    @ApiOperation("便签列表")
+    public AjaxResult findNoteList(@RequestBody MedicalRecordHistoryDto dto) {
+        List<MedicalRecordNoteVO> voList = new ArrayList<>();
+        MedicalRecordNoteVO vo;
+        List<MedicalRecord> recordList = medicalRecordService.findListByToothPosition(dto);
+        if (CollectionUtils.isNotEmpty(recordList)) {
+            for (MedicalRecord medicalRecord : recordList) {
+                vo = new MedicalRecordNoteVO();
+                vo.setCreateDate(medicalRecord.getCreateDate());
+                vo.setNoteContent(medicalRecord.getNoteContent());
+                vo.setDiagnosisContent(medicalRecord.getDiagnosisContent());
+                List<MedicalRecordDetails> list = medicalRecordDetailsService.list(Wrappers.<MedicalRecordDetails>lambdaQuery()
+                        .eq(MedicalRecordDetails::getMedicalRecordId, medicalRecord.getId()));
+
+                if (CollectionUtils.isNotEmpty(list)) {
+                    List<MedicalRecordToothVO> toothList = new ArrayList<>();
+                    MedicalRecordToothVO toothVO;
+                    for (MedicalRecordDetails medicalRecordDetails : list) {
+                        toothVO = new MedicalRecordToothVO();
+                        BeanUtils.copyProperties(medicalRecordDetails, toothVO);
+                        toothList.add(toothVO);
+                    }
+                    vo.setToothList(toothList);
                 }
+                voList.add(vo);
             }
         }
+
         return success(voList);
     }
 
+    @PostMapping("/getInfoByDiagnosisTypeTemplateId")
+    @ApiOperation("通过诊断模板id获取病例数据")
+    public AjaxResult getInfoByDiagnosisTypeTemplateId(@RequestBody MedicalRecordParam param) {
+        DiagnosisTypeTemplate diagnosisTypeTemplate = diagnosisTypeTemplateService.getById(param.getDiagnosisTypeTemplateId());
+        String patientId = param.getPatientId();
+        // 封装模板信息
+        DiagnosisTypeTemplateDto dto = new DiagnosisTypeTemplateDto();
+        dto.setPatientId(patientId);
+        dto.setMainDiagnosis(diagnosisTypeTemplate.getDiagnosisManageName());
+        dto.setMainDiagnosisId(diagnosisTypeTemplate.getDiagnosisManageId());
+        dto.setPatientAllergyHistory(medicalHistoryService.findMedicalHistory(patientId, MedicalHistoryDiseaseTypeEnum.ALLERGY_HISTORY.getCode()));
+        dto.setPatientPastHistory(medicalHistoryService.findMedicalHistory(patientId, MedicalHistoryDiseaseTypeEnum.PAST_HISTORY.getCode()));
+        dto.setPatientFamilyHistory(medicalHistoryService.findMedicalHistory(patientId, MedicalHistoryDiseaseTypeEnum.FAMILY_HISTORY.getCode()));
+        dto.setChiefComplaintOption(JSONObject.parseObject(diagnosisTypeTemplate.getChiefComplaintOption()));
+        dto.setPresentIllnessOption(JSONObject.parseObject(diagnosisTypeTemplate.getPresentIllnessOption()));
+        dto.setInspectOption(JSONObject.parseObject(diagnosisTypeTemplate.getInspectOption()));
+        dto.setTreatmentPlanningOption(JSONObject.parseObject(diagnosisTypeTemplate.getTreatmentPlanningOption()));
+        dto.setDisposeOption(JSONObject.parseObject(diagnosisTypeTemplate.getDisposeOption()));
+        dto.setNoteOption(JSONObject.parseObject(diagnosisTypeTemplate.getNoteOption()));
+
+        dto.setChiefComplaintContent(JSONObject.parseObject(diagnosisTypeTemplate.getChiefComplaintOption()).getString("text"));
+        dto.setPresentIllnessContent(JSONObject.parseObject(diagnosisTypeTemplate.getPresentIllnessOption()).getString("text"));
+        dto.setInspectContent(JSONObject.parseObject(diagnosisTypeTemplate.getInspectOption()).getString("text"));
+        dto.setTreatmentPlanningContent(JSONObject.parseObject(diagnosisTypeTemplate.getTreatmentPlanningOption()).getString("text"));
+        dto.setDisposeContent(JSONObject.parseObject(diagnosisTypeTemplate.getDisposeOption()).getString("text"));
+        dto.setNoteContent(JSONObject.parseObject(diagnosisTypeTemplate.getNoteOption()).getString("text"));
+
+        dto.setId(diagnosisTypeTemplate.getId());
+
+        List<String> otherDiagnosisTypeTemplateIdList = param.getOtherDiagnosisTypeTemplateIdList();
+        if (CollectionUtils.isNotEmpty(otherDiagnosisTypeTemplateIdList)) {
+            List<DiagnosisTypeTemplate> list = diagnosisTypeTemplateService.listByIds(otherDiagnosisTypeTemplateIdList);
+            dto.setOtherDiagnosis(list.stream().map(DiagnosisTypeTemplate::getDiagnosisManageName).collect(Collectors.toList()));
+        }
+
+        return success(dto);
+    }
+
     //subList手动分页，page为第几页，rows为每页个数
     public static TableDataInfo subList(List<MedicalRecordListDto> list, int page, int rows) {
         List<MedicalRecordListDto> listSort = new ArrayList<>();

eitc-patient-pc/src/main/java/com/eitc/patient/controller/NoticeManageController.java

@@ -49,8 +49,9 @@ public class NoticeManageController extends BaseController {
         startPage();
         LambdaQueryWrapper<NoticeManage> wrapper = Wrappers.<NoticeManage>lambdaQuery().orderByDesc(NoticeManage::getCreateDate)
                 .like(StringUtils.isNotBlank(noticeManage.getNoticeTitle()), NoticeManage::getNoticeTitle, noticeManage.getNoticeTitle())
-                .like(Objects.nonNull(noticeManage.getPublishStatus()), NoticeManage::getPublishStatus, noticeManage.getPublishStatus())
-                .like(Objects.nonNull(noticeManage.getDisplayStatus()), NoticeManage::getDisplayStatus, noticeManage.getDisplayStatus());
+                .eq(Objects.nonNull(noticeManage.getPublishStatus()), NoticeManage::getPublishStatus, noticeManage.getPublishStatus())
+                .eq(Objects.nonNull(noticeManage.getDisplayStatus()), NoticeManage::getDisplayStatus, noticeManage.getDisplayStatus());
+        wrapper.orderByDesc(NoticeManage::getCreateDate);
         List<NoticeManage> list = noticeManageService.list(wrapper);
         return getDataTable(list);
     }

eitc-patient-pc/src/main/java/com/eitc/patient/controller/OperationsAnalysisController.java

@@ -130,7 +130,7 @@ public class OperationsAnalysisController extends BaseController {
         result.put("patientAppointmentStatus", patientAppointmentStatusList);
 
         // 诊断统计（列出诊断类型前十名及个数）
-        List<Map<String, String>> diagnosisCountList = medicalRecordDetailsService.countByDiagnosisTypeName();
+        List<Map<String, String>> diagnosisCountList = medicalRecordService.countByDiagnosisTypeName();
         result.put("diagnosisCount", diagnosisCountList);
 
         return success(result);

eitc-patient-pc/src/main/java/com/eitc/patient/controller/PatientController.java

@@ -8,6 +8,7 @@ import com.eitc.common.core.controller.BaseController;
 import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.core.domain.entity.SysUser;
 import com.eitc.common.enums.BusinessType;
+import com.eitc.common.utils.PatientBaseUtil;
 import com.eitc.common.utils.bean.BeanUtils;
 import com.eitc.patient.domain.MedicalHistory;
 import com.eitc.patient.domain.Patient;
@@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -72,7 +74,7 @@ public class PatientController extends BaseController {
      */
     @GetMapping("/list")
     @ApiOperation("查询患者")
-    public AjaxResult list(@RequestParam(name = "searchParam", required = false) String searchParam) {
+    public AjaxResult list(@RequestParam(name = "searchParam", required = false) String searchParam) throws ParseException {
         LambdaQueryWrapper<Patient> eq = Wrappers.<Patient>lambdaQuery()
                 .like(StringUtils.isNotBlank(searchParam), Patient::getPatientPhone, searchParam).or()
                 .like(StringUtils.isNotBlank(searchParam), Patient::getLinkPhone, searchParam).or()
@@ -107,12 +109,12 @@ public class PatientController extends BaseController {
      * @param li Patient实体类对象，代表一个患者的信息。
      * @return 返回填充了预约信息和病史信息的PatientVO对象。
      */
-    private PatientVO getPatientVO(Patient li) {
+    private PatientVO getPatientVO(Patient li) throws ParseException {
         // 创建一个PatientVO对象，用于存储患者的信息。
         PatientVO vo = new PatientVO();
         // 使用BeanUtils工具类，将Patient对象的属性值复制到PatientVO对象中。
         BeanUtils.copyProperties(li, vo);
-
+        vo.setAge(PatientBaseUtil.findAge(li.getIdentificationCard()));
         // 查询该患者的所有预约信息，并按照创建日期降序排列。
         List<PatientAppointment> list = patientAppointmentService.list(Wrappers.<PatientAppointment>lambdaQuery()
                 .eq(PatientAppointment::getAppointmentPersonId, li.getId())
@@ -171,9 +173,20 @@ public class PatientController extends BaseController {
      */
     @GetMapping(value = "/detail")
     @ApiOperation("获取患者详细信息")
-    public AjaxResult detail(String id) {
+    public AjaxResult detail(String id) throws ParseException {
         Patient patient = patientService.getById(id);
-        return success(getPatientVO(patient));
+        PatientVO vo = getPatientVO(patient);
+        List<SysUser> sysUserList = PatientUtil.findUserListByLoginUser();
+        String visitingPhysicianSet = vo.getVisitingPhysicianSet();
+        long count = 0L;
+        if (StringUtils.isNotBlank(visitingPhysicianSet)) {
+            count = sysUserList.stream().filter(user -> visitingPhysicianSet.contains(user.getNickName())).count();
+        }
+        if (CollectionUtils.isEmpty(sysUserList) || count > 0) {
+            return success(vo);
+        }
+
+        return success(new PatientVO());
     }
 
     /**

eitc-patient-pc/src/main/java/com/eitc/patient/controller/SchedulingDetailsController.java

@@ -112,7 +112,7 @@ public class SchedulingDetailsController extends BaseController {
             List<Map<String, String>> dataList = new ArrayList<>();
             int actualMaximum = instance.getActualMaximum(Calendar.DAY_OF_MONTH);
             List<SchedulingDetails> detailsList = listMap.get(String.valueOf(user.getUserId()));
-            for (int i = 1; i < actualMaximum; i++) {
+            for (int i = 1; i < actualMaximum + 1; i++) {
                 instance.set(Calendar.DAY_OF_MONTH, i);
                 int d = instance.get(Calendar.DAY_OF_MONTH);
                 int w = instance.get(Calendar.DAY_OF_WEEK);

eitc-quartz/src/main/java/com/eitc/quartz/task/SchedulingConfigurationTask.java

@@ -44,7 +44,7 @@ public class SchedulingConfigurationTask {
             Map<Integer, String> collect = listMap.get(doctorId).stream()
                     .collect(Collectors.toMap(SchedulingConfiguration::getWeekNum, SchedulingConfiguration::getWorkStatus));
 
-            for (int day = 1; day <= actualMaximum; day++) {
+            for (int day = 1; day <= actualMaximum + 1; day++) {
                 instance.set(Calendar.DAY_OF_MONTH, day);
                 int week = instance.get(Calendar.DAY_OF_WEEK);
 

eitc-system/src/main/java/com/eitc/system/utils/SendSmsUtil.java

@@ -1,5 +1,6 @@
 package com.eitc.system.utils;
 
+import com.alibaba.fastjson2.JSON;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
@@ -9,11 +10,14 @@ import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
 import com.eitc.common.core.domain.entity.SysDictData;
+import com.eitc.common.utils.StringUtils;
 import com.eitc.common.utils.spring.SpringUtils;
 import com.eitc.system.service.ISysDictDataService;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -48,31 +52,31 @@ public class SendSmsUtil {
      * @date: 2024/7/31 11:24
      */
     public static void sendSms(String phoneNum, String code, String templateCodeToDict) throws ClientException {
-        String accessKeyId = "access-key-id";
-        String accessKeySecret = "access-key-secret";
-        String signName = "sign-name";
-        String templateCode = "template-code";
+        String accessKeyId = "access-key-id", accessKeyIdContent = null;
+        String accessKeySecret = "access-key-secret", accessKeySecretContent = null;
+        String signName = "sign-name", signNameContent = null;
+        String templateCodeContent = null;
 
         ISysDictDataService dictDataService = SpringUtils.getBean(ISysDictDataService.class);
         List<SysDictData> ermSms = dictDataService.selectDictDataByType("erm_sms");
         for (SysDictData ermSm : ermSms) {
             if (Objects.equals(accessKeyId, ermSm.getDictLabel())) {
-                accessKeyId = ermSm.getDictValue();
+                accessKeyIdContent = ermSm.getDictValue();
             }
             if (Objects.equals(accessKeySecret, ermSm.getDictLabel())) {
-                accessKeySecret = ermSm.getDictValue();
+                accessKeySecretContent = ermSm.getDictValue();
             }
             if (Objects.equals(signName, ermSm.getDictLabel())) {
-                signName = ermSm.getDictValue();
+                signNameContent = ermSm.getDictValue();
             }
             if (Objects.equals(templateCodeToDict, ermSm.getDictLabel())) {
-                templateCode = ermSm.getDictValue();
+                templateCodeContent = ermSm.getDictValue();
             }
         }
 
         final String product = "Dysmsapi";
         final String endpoint = "dysmsapi.aliyuncs.com";
-        IClientProfile profile = DefaultProfile.getProfile("cn-beijing", accessKeyId, accessKeySecret);
+        IClientProfile profile = DefaultProfile.getProfile("cn-beijing", accessKeyIdContent, accessKeySecretContent);
         DefaultProfile.addEndpoint("cn-beijing", product, endpoint);
         IAcsClient client = new DefaultAcsClient(profile);
 
@@ -80,9 +84,14 @@ public class SendSmsUtil {
         SendSmsRequest request = new SendSmsRequest();
         request.setSysMethod(MethodType.POST);
         request.setPhoneNumbers(phoneNum);
-        request.setSignName(signName);
-        request.setTemplateCode(templateCode);
-        request.setOutId(code);
+        if (StringUtils.isNotEmpty(signNameContent)) {
+            request.setSignName(signNameContent);
+        }
+        request.setTemplateCode(templateCodeContent);
+
+        Map<String, String> jsonParam = new HashMap<>();
+        jsonParam.put("code", code);
+        request.putQueryParameter("TemplateParam", JSON.toJSONString(jsonParam));
 
         SendSmsResponse response = client.getAcsResponse(request);
         if (!"OK".equals(response.getCode())) {

pom.xml

@@ -297,6 +297,23 @@
                 <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
                 <version>1.0.0</version>
             </dependency>
+
+            <!-- 第三方拼音依赖包，配合 hutool-all 包中的 PinyinUtil 拼音工具使用 start -->
+            <dependency>
+                <groupId>com.belerweb</groupId>
+                <artifactId>pinyin4j</artifactId>
+                <version>2.5.0</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.biezhi</groupId>
+                <artifactId>TinyPinyin</artifactId>
+                <version>2.0.3.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.stuxuhai</groupId>
+                <artifactId>jpinyin</artifactId>
+                <version>1.1.8</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>