解决冲突

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IPmsPatientService.java

@@ -24,6 +24,8 @@ public interface IPmsPatientService {
 
     PmsPatientVo.PatientInfo getPatientInfoById(Long id);
 
+    PmsPatientVo.PatientInfo getPatientInfoById(Long id, String visitNo);
+
     PmsPatientVo.PatientInfo editPatient(PmsPatient pmsPatient);
 
     Long editPatientOtherMsg(PmsPatientDto.EditOtherMsg param);

ruisi_java/ruisi-web-admin/src/main/resources/application-prod.yml

@@ -6,11 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-<<<<<<< HEAD
         url: jdbc:mysql://172.16.21.24:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-=======
-        url: jdbc:mysql://172.28.145.18:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
->>>>>>> master
         username: root
         password: xian#2024!!!
       # 从库数据源
@@ -66,11 +62,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-<<<<<<< HEAD
     host: 172.16.21.24
-=======
-    host: 172.28.147.15
->>>>>>> master
     # 端口，默认为6379
     port: 26379
     # 数据库索引

ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml

@@ -1489,7 +1489,8 @@ d.dept_name                as hospitalName
             WHERE user_id = #{userId}
             )
         </if>
-        group by r.id desc
+        group by r.id
+        order by r.id desc
     </select>
 
 <!--    <resultMap id="ResultMap" type="com.ccsens.system.domain.vo.RmsVo$ReportScore">-->

ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml

@@ -6,18 +6,14 @@ spring:
     druid:
       # 主库数据源
       master:
-<<<<<<< HEAD
         url: jdbc:mysql://172.16.21.24:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-=======
-        url: jdbc:mysql://172.28.145.18:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
->>>>>>> master
         username: root
         password: xian#2024!!!
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: true
-        url: jdbc:mysql://172.28.145.18:23306/ruisi_cga_whszxyjhyy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://172.16.21.24:23306/ruisi_cga_hnszyyy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: xian#2024!!!
       # 初始连接数
@@ -66,11 +62,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-<<<<<<< HEAD
     host: 172.16.21.24
-=======
-    host: 172.28.147.15
->>>>>>> master
     # 端口，默认为6379
     port: 26379
     # 数据库索引
@@ -127,25 +119,18 @@ file:
   reportPath: /data/cgav2/profile
   grPath: /data/cgav2/profile/grReportTemplate.docx
   ysPath: /data/cgav2/profile/ysReportTemplate.docx
-<<<<<<< HEAD
   allPath: /data/cgav2/profile/all_report_template.docx
-=======
->>>>>>> master
 
 informed:
   studySign: /data/cgav2/profile/studySign.png
   template: /data/cgav2/profile/知情同意模板.docx
   wordUrl: /data/cgav2/profile/informed/
-<<<<<<< HEAD
   prefixWord: /data/cgav2
-=======
-  prefixWord: /data/cgav2/
->>>>>>> master
 #clientVersion: v1.6.8
 #clientVersion: v1.8.1.0
 #clientVersion: v1.8.2.0
 clientVersion: v1.8.3.0
 
 # 医院id，不同医院部署的时候需要修改
-hospitalId: 184
+hospitalId: 178
 generalPassword: cga123#