From a389acecd582e81c34037326d5808152f97efffb Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 03 九月 2025 09:12:58 +0800
Subject: [PATCH] 接口题目层增加answerps字段门诊记录接口新加否已随访的标记
---
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 9 +
smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java | 4
ruoyi-admin/src/main/resources/application-hzszlyy.yml | 219 +++++++++++++++++++++++++++++++++++++++++++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 20 +++
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 8 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HNGatherPatArchiveController.java | 1
smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml | 4
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 3
smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java | 2
9 files changed, 258 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HNGatherPatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HNGatherPatArchiveController.java
index 0ae17bd..f25b178 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HNGatherPatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HNGatherPatArchiveController.java
@@ -38,6 +38,7 @@
@RestController
@RequestMapping("/smartor/hngather")
@Api(description = "娌冲崡閲囬泦鎮ｈ�呬俊鎭帴鍙�")
+
public class HNGatherPatArchiveController extends BaseController {
@Autowired
private IHNGatherPatArchiveService ihnGatherPatArchiveService;
diff --git a/ruoyi-admin/src/main/resources/application-hzszlyy.yml b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
new file mode 100644
index 0000000..c261d90
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
@@ -0,0 +1,219 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ # driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 涓诲簱鏁版嵁婧�
+ master:
+ url: jdbc:mysql://192.169.129.197:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: smartor
+ password: smartor
+ driverClassName: com.mysql.cj.jdbc.Driver
+ # 浠庡簱鏁版嵁婧�
+ slave:
+ enabled: true
+ url: jdbc:oracle:thin:@//192.200.85.40:1521/hzsyhis?useUnicode=true&characterEncoding=GBK
+ username: wssf
+ password: Hzsywssf
+ driver-class-name: oracle.jdbc.OracleDriver
+ # 鍒濆杩炴帴鏁�
+ initialSize: 5
+ # 鏈�灏忚繛鎺ユ睜鏁伴噺
+ minIdle: 10
+ # 鏈�澶ц繛鎺ユ睜鏁伴噺
+ maxActive: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ maxWait: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ timeBetweenEvictionRunsMillis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ minEvictableIdleTimeMillis: 300000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ maxEvictableIdleTimeMillis: 900000
+ # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+ validationQuery: SELECT 1 FROM DUAL
+ #validationQuery: SELECT 1
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: false
+ # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+ allow:
+ url-pattern: /druid/*
+ # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+ login-username: lihu
+ login-password: Lihu@1363419#$
+ filter:
+ stat:
+ enabled: true
+ # 鎱QL璁板綍
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+ # redis 閰嶇疆
+ redis:
+ host: 127.0.0.1
+ port: 6379
+
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # 瀵嗙爜
+ password:
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+magic-api:
+ web: /magic/web
+ resource:
+ type: database # 閰嶇疆瀛樺偍鍦ㄦ暟鎹簱涓�
+ tableName: magic_config # 鏁版嵁搴撲腑鐨勮〃鍚�
+ prefix: /api
+ readonly: false
+ sql-column-case: camel
+ show-sql: false #閰嶇疆鎵撳嵃SQL
+ page-config:
+ size: size
+ page: page
+ default-page: 1
+ default-size: 10
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: false
+ # 璇锋眰鍓嶇紑
+ pathMapping: /dev-api
+
+#閽夐拤鐨勫瘑閽�
+dingAppid: dingn8iip5ubj7clrrsv
+dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
+
+
+# websocket瓒呮椂鏃堕棿
+server:
+websocket:
+timeout=60000:
+
+
+accessKeyId: LTAI5tPfc1VJzz7VuhzcBwug
+accessKeySecret: gG1srKxPFDBNWe2oHfqmK1qsSQkf1e
+signName: 鏉窞鍒╂箹绉戞妧
+
+#鏅鸿兘鍛煎彨(涓婃捣)
+phoneIP: http://124.220.50.51
+phonePort: 8001
+#鏉窞
+hzphoneIP: http://121.43.112.160
+hzphonePort: 8088
+#鐢佃瘽绾胯矾锛�1 涓婃捣锛�2 鏉窞锛�
+phonePath: 2
+#鑷繁鐨勭數璇濆彿鐮�
+phoneMySelf: 83234089
+##鎺堟潈 id(鏉窞)
+#app_id: hzgs
+##鎺堟潈 key(宸插姞瀵嗚繃鐨� key)(鏉窞)
+#app_key: 605453540c4a0a692fe07e1cae1162f3
+#鎺堟潈 id(鏉窞)
+app_id: hz_ali
+#鎺堟潈 key(宸插姞瀵嗚繃鐨� key)(鏉窞)
+app_key: a2f3b5799d635216aa280362fafd8c35
+
+
+pub_key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQzqW1EIXBKGMu+2oEYSB5gM7Ox/ihyYTeeoE0yPX1qtt4++5yNOeTBVd6EEM4iKzVEzWj6REIWVwaSNPn/SvUCAwEAAQ==
+#杩欎釜鏄悗绔殑绉侀挜锛岀敤涓嶅埌
+pri_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEAtDOpbUQhcEoYy77agRhIHmAzs7H+KHJhN56gTTI9fWq23j77nI055MFV3oQQziIrNUTNaPpEQhZXBpI0+f9K9QIDAQABAkB3n0fcWfrcoMN/FU3VnrnZOEF6CzFNxkgU9P8y36QECWKZ9JhYQkNpKrMC9oXlN3VSaRigV7B+L/I/a0Rs1W+tAiEA4jx7xcXJ4y4BNwAmVHt6NNiEkzIwWnwC/0qsEu8NsOsCIQDL6MMn1D2uznC6OuOWpxDCkBh1JL1NzZTZeH2G+hj7nwIgKGAC9tjFnvWm4dn0/T7MIIJDpsFeP8fCAS2iZ/6hwuECIAS/eLvWr1EAsZNEh8QcQ8GkBU3E+ztyjAK8UX/xFt/VAiBf79/1tDErX4/DChecM8w3c3DhbBcjuE3fHZn7p6/UKg==
+#鍓嶇绉侀挜锛堢敤涓嶅埌浜嗭級
+#pri_key: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEApHTIe/StslZAT5Jzv8XClbrqox32pfaTrP5IOCRJ3FaH/UZsGgA/tsNBBEXq9eagqwPbJrjYfpdEtINcChrK4wIDAQABAkEAilDujdKshGGmlUZHs/NQRT6AOdDpsYxBiC4V76IVvQpw0IW6c4HGEvH4T+xRufika7/48L0eu0f06H+YtL5lgQIhANUd0a6oSsVxWifAjtKwMZcXD3OaIxQIQSCN4NT4VFY3AiEAxYxYrIhkIyg+UVw3WOSvBpXKxM4/WL9HRzkxDLvp2rUCIQCK23P8tgCJ5xJT5l3onw6goFDcBKkoazxsBqVgfjENPwIgWbuTd+OIYPPhwsE5ntZZrosSDO2GlsBkFzUiU59z7VUCIA0LL+9IFb+FWCl3DGTwIQ9SZYbv61T83LKjebUcSOfe
+
+#浜岀淮鐮佽矾寰�
+qrpath: D:\qrcode
+
+#鍏徃鍐呭閾捐姹侷P鍜岀鍙ｅ彿
+#req_path: 8095
+#localIP: 192.168.2.13
+
+#鏂板崕鍖婚櫌澶栭摼璇锋眰IP鍜岀鍙ｅ彿
+req_path: 8093
+#localIP: https://wx.lihusmart.com
+#涓芥按澶栭摼璇锋眰IP鍜岀鍙ｅ彿
+localIP: http://221.12.19.26
+
+#鑾峰彇鎮ｈ�呬俊鎭疷RL(鍗庡崜鎻愪緵)
+hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
+
+# 0浠ｈ〃璧伴粯璁ょ殑涓婁紶 1 浠ｇ爜璧版柊鍗庡尰闄㈢殑涓婁紶
+uploadSwitch: 0
+
+# 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴)
+ASRCallBackPath: http://192.168.100.10:8095/smartor/serviceSubtask/phoneCallBackYQ
+#鎸傛柇IP(鏈湴)
+hangup: http://192.168.100.6:8089/hangup
+#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴)
+app_key_yq: ZurNHpaQLq6P55YS
+
+## 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏂板崕)
+#ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ
+##鎸傛柇IP(鏂板崕)
+#hangup: http://192.16.4.220:8091/hangup
+##fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏂板崕)
+#app_key_yq: ZurNHpaQLq6P55YS
+
+#鏈� 鍦� 鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
+#xhsmsPath: http://192.168.2.13:8092/sendSms
+#鏂板崕鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
+xhsmsPath: http://192.16.4.220:8092/sendSms
+#甯愬彿
+xhsmsAccount: 911124
+#鎺ュ彛瀵嗙爜
+xhsmsPwd: zW5eXe
+#铏氭嫙鎺ュ叆鐮�
+xhsmsjrm: 1069055
+
+##鏈湴FTP杩炴帴
+#FTP_SERVER: "192.168.2.13"
+#FTP_USERNAME: voice
+#FTP_PASSWORD: xh@2023
+
+#鏂板崕FTP杩炴帴
+FTP_SERVER: "192.16.4.220"
+FTP_USERNAME: voice
+FTP_PASSWORD: xh@2023
+
+#璇煶鍦板潃璁块棶鍓嶇紑(鏂板崕)
+voicePathPrefix: http://192.168.191.181:8095/profile/upload/vadio/
+#璇煶鍦板潃璁块棶鍓嶇紑(鍏徃)
+#voicePathPrefix: http://192.168.2.13:8095/profile/upload/vadio/
+
+#绗釜灏忔椂鐢佃瘽鎷ㄦ墦鐨勪笂闄�
+phoneUpEveryHour: 12
+#鐢佃瘽姣忓ぉ缁撴潫鏃堕棿
+phoneEndHour: 20
+
+#鏂板憳宸ラ粯璁ゅ瘑鐮�
+defaultPwd: 123456
+
+#鏄惁闇�瑕佹牴鎹柧鐥呭缓绔嬪嚭闄㈡偅鑰呴殢璁�
+createIcd10Visit: false
+
+#admin绠＄悊鍛榰serId
+isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
+
+#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
+visitHosp: 2
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index 954d2b6..c73331b 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -192,8 +192,24 @@
public Integer selectIcd10List(Icd10 icd10) {
List<Icd10> icd10s = chMapper.selectIcd10List(icd10);
log.info("selectIcd10List鐨勯噰闆嗗埌鐨勬暟閲忎负锛歿}", icd10s.size());
- int i = icd10Mapper.batchIcd10(icd10s);
- return i;
+ int size = 0;
+ if (icd10s.size() > 500) {
+ int i = icd10s.size() / 500;
+ for (int a = 0; a < i + 1; a++) {
+ if (a >= 0 && a < i) {
+ List<Icd10> icd10Temp = icd10s.subList(a * 500, (a + 1) * 500);
+ size += icd10Mapper.batchIcd10(icd10Temp);
+ } else {
+ List<Icd10> icd10Temp = icd10s.subList(i * 500, icd10s.size());
+ if (icd10Temp != null && icd10Temp.size() != 0) {
+ size += icd10Mapper.batchIcd10(icd10Temp);
+ }
+ }
+ }
+ } else {
+ size += icd10Mapper.batchIcd10(icd10s);
+ }
+ return size;
}
@Override
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index b3fed9d..1376bcd 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -365,16 +365,16 @@
<select id="yhyjsxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserRoleResult">
select user_id, role_id, orgid
- FROM yhyjsxx
+ FROM healthy_user_role
<where>
<if test="hisUserId != null ">and user_id = #{hisUserId}</if>
</where>
</select>
<select id="yhyksxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
- select user_id, user_code, dept_type,department_id as
- dept_id,dept_name,deptparent,del_flag,orgid,create_time,create_by,update_time,update_by
- FROM yhyksxx
+ select user_id, user_code, dept_type,dept_code as
+ dept_id,dept_name,deptparent,del_flag,orgid
+ FROM healthy_user_dept
<where>
user_id != 'admin'
<if test="hisUserId != null ">and user_id = #{hisUserId}</if>
@@ -627,6 +627,7 @@
d.email,
d.status,
d.his_dept_id,
+ d.orgid,
d.his_parent_id
FROM healthy_dept d
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
index b3e423a..b56d265 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -226,5 +226,9 @@
@Excel(name = " 璇佷欢鍙风爜 ")
private String idcardno;
+ @ApiModelProperty(value = "鏄惁鏈夐殢璁�0娌℃湁;>=1鏈夐殢璁� ")
+ private String serverState;
+
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java
index afadacd..8e8203e 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java
@@ -271,5 +271,7 @@
@ApiModelProperty("棰樼洰缁撴灉ID(service_subtask_detail閲岀殑涓婚敭)")
private String scriptResultId;
+ @ApiModelProperty("閫夐」绛旀鐨勯檮鍔犱俊鎭�")
+ private String answerps;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index 383e489..aa9a70c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -402,6 +402,8 @@
if (StringUtils.isNotEmpty(scriptResult.get("asrtext")))
svyLibTemplateScriptVO.setScriptResult(StringUtils.isNotEmpty(scriptResult.get("asrtext")) ? scriptResult.get("asrtext").replaceAll("^(\"|')(.*)\\1$", "$2") : "");
svyLibTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
+ if (StringUtils.isNotEmpty(scriptResult.get("answerps")))
+ svyLibTemplateScriptVO.setAnswerps(scriptResult.get("answerps"));
}
}
map.put("scriptResult", svyLibTemplateScriptVOList);
@@ -427,6 +429,7 @@
if (CollectionUtils.isNotEmpty(serviceSubtaskDetails)) {
map.put("asrtext", serviceSubtaskDetails.get(0).getAsrtext());
map.put("asrtextId", serviceSubtaskDetails.get(0).getId());
+ map.put("answerps", serviceSubtaskDetails.get(0).getAnswerps());
return map;
}
return null;
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index a51fa27..30ba326 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -113,8 +113,11 @@
pmo.hpi,
pmo.fuflag,
pmo.patname,
- pmo.mainsuit
- from pat_med_outhosp pmo
+ CONCAT(pa.age,pa.age_unit,pa.age2,pa.age_unit2) AS age,
+ pa.telcode,
+ pmo.mainsuit,
+ pa.idcardno
+ from pat_med_outhosp pmo left join pat_archive pa on pmo.patid = pa.id
<where>
pmo.del_flag=0
<if test="orgid != null ">and pmo.orgid = #{orgid}</if>
@@ -132,7 +135,6 @@
date_format(#{endTime},'%y%m%d')
</if>
<if test="patid != null ">and pmo.patid = #{patid}</if>
- <if test="serialnum != null ">and pmo.serialnum = #{serialnum}</if>
<if test="fuflag != null ">and pmo.fuflag = #{fuflag}</if>
<if test="patno != null ">and pmo.patno = #{patno}</if>
<if test="outhospno != null and outhospno != ''">and pmo.outhospno = #{outhospno}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
index bec2bd9..761ca97 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
@@ -54,7 +54,6 @@
<result property="patid" column="patid"/>
<result property="guid" column="guid"/>
<result property="extemplateText" column="extemplate_text"/>
- <result property="answerps" column="answerps"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskDetailTarget" id="ServiceSubtaskDetailTargetResult">
<result property="targetid" column="targetid"/>
@@ -112,8 +111,7 @@
update_by,
update_time,
value_type,
- create_by,
- answerps
+ create_by
from service_subtask_detail
</sql>
--
Gitblit v1.9.3