Commit Graph

362 Commits

Author SHA1 Message Date
zhangheng
3b4c4f2c40 科室 2024-05-07 17:25:42 +08:00
haown
45f25f3bad Merge remote-tracking branch 'origin/0418_小程序开发' into dev 2024-05-07 14:32:46 +08:00
haown
491229fc0f 修改问题。 2024-05-07 14:31:45 +08:00
zhangheng
d370f1d9b4 机构 2024-05-07 09:39:43 +08:00
zhangheng
2ecb3e50fa 专病路径 2024-05-07 09:06:45 +08:00
zhangheng
6f76ab1e63 专病路径 2024-05-06 09:13:32 +08:00
haown
1d26f3c421 Merge remote-tracking branch 'origin/0424_数据权限' into 0418_小程序开发 2024-04-29 15:19:49 +08:00
haown
ba5dbf1302 修改患者管理列表数据范围查询。 2024-04-29 15:18:07 +08:00
zhangheng
5aa0e7b730 小程序满意度 2024-04-29 13:45:42 +08:00
haown
5b8a78447b 修改类名。 2024-04-28 16:59:23 +08:00
zhangheng
97f6d465cb 小程序满意度 2024-04-28 10:22:18 +08:00
zhangheng
b1a6b26807 小程序满意度 2024-04-28 09:42:14 +08:00
zhangheng
158dafcbcb 小程序满意度 2024-04-25 17:54:02 +08:00
haown
ed5c15990b 修改小程序端任务列表。 2024-04-25 17:04:40 +08:00
haown
b2d8cd0e02 datascope修改,字段统一。 2024-04-24 14:15:25 +08:00
haown
ccba16ee5b Merge branch 'dev' into 0418_小程序开发 2024-04-24 09:10:50 +08:00
zhangheng
f2d9cde171 专病路径修改 2024-04-23 17:38:54 +08:00
haown
6f0f54304e 修改测试问题。 2024-04-23 16:36:37 +08:00
zhangheng
7ba09706a1 专病路径修改 2024-04-23 14:27:19 +08:00
zhangheng
d44124f756 手动创建任务修改 2024-04-23 14:15:05 +08:00
youxilong
1708d21ca4 优化人工随访处理中的修改节点任务方法 2024-04-22 17:07:55 +08:00
zhangheng
f3229528ac 合并dev 2024-04-22 15:04:35 +08:00
zhangheng
b37ede6bcb Merge branch 'dev' into 0418_小程序开发 2024-04-22 15:03:55 +08:00
zhangheng
6c1f449b16 我的随访 2024-04-22 15:03:18 +08:00
zhangheng
b93729ea24 导入修改 2024-04-22 09:23:37 +08:00
zhangheng
7f839b4126 导入修改 2024-04-19 17:17:55 +08:00
haown
d6ea866154 修改签约保存。 2024-04-19 15:05:24 +08:00
haown
e733c82e6e Merge remote-tracking branch 'origin/0418_小程序开发' into dev 2024-04-19 14:54:37 +08:00
haown
8985512315 修改预住院患者删除。 2024-04-19 14:54:02 +08:00
haown
188f9ff7c2 Merge branch 'dev' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into dev 2024-04-19 14:35:05 +08:00
haown
5627616a9a Merge remote-tracking branch 'origin/0418_小程序开发' into dev 2024-04-19 14:34:42 +08:00
haown
76809ff2f5 修改患者删除。 2024-04-19 14:34:03 +08:00
haown
13429f9c0f 修改门诊在院患者删除。 2024-04-19 14:32:33 +08:00
zhangheng
8acd752d87 专病路径随访 2024-04-19 11:25:58 +08:00
zhangheng
f7697d4d2c 专病路径随访 2024-04-19 11:01:33 +08:00
haown
4b580c2e47 修改意向签约。 2024-04-19 10:14:21 +08:00
haown
05e09eff4e Merge remote-tracking branch 'origin/0418_小程序开发' into dev 2024-04-19 09:47:15 +08:00
haown
71a9764480 修改测试问题。 2024-04-19 09:46:27 +08:00
haown
00a332cb9a Merge branch 'dev' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into dev 2024-04-19 08:33:35 +08:00
haown
8bfe8ddc46 修改测试问题。 2024-04-18 17:59:38 +08:00
gognqingkai
1a41b74097 修改资讯查询模糊搜索,字段信息管理排序 2024-04-18 14:52:39 +08:00
haown
c2ef98dc6d Merge branch 'dev' into 0418_小程序开发 2024-04-18 10:27:31 +08:00
haown
726bccb364 Merge remote-tracking branch 'origin/3.11_院后第二增量' into dev 2024-04-18 10:26:50 +08:00
haown
b66255af0c 非空判断。 2024-04-18 10:24:40 +08:00
zhangheng
152a88d3c9 小程序开发 2024-04-18 10:22:37 +08:00
haown
3b6b672a06 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-04-18 10:21:44 +08:00
zhangheng
506daecbaf 0418合并第二增量 2024-04-18 10:21:33 +08:00
zhangheng
0b4bdf0658 Merge remote-tracking branch 'origin/3.11_院后第二增量' into dev 2024-04-18 10:20:31 +08:00
zhangheng
d313256409 专病路径任务类型 2024-04-18 09:57:21 +08:00
haown
6641504c67 Merge branch 'dev' into 3.11_院后第二增量 2024-04-18 09:23:29 +08:00
haown
a76fc417ec 修改签约。 2024-04-18 09:16:02 +08:00
haown
31e5aa5414 小程序患者任务接口。 2024-04-17 16:55:51 +08:00
纪寒
21da267ac9 Merge remote-tracking branch 'origin/3.11_院后第二增量' into dev 2024-04-17 09:24:50 +08:00
gognqingkai
7cef1a057d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	postdischarge-admin/src/main/resources/application.yml
#	postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
2024-04-16 15:33:23 +08:00
gognqingkai
e00a55efad 资讯管理 资讯信息和资讯分类实现 add by gqk 2024/04/16 15:29 2024-04-16 15:31:29 +08:00
zhangheng
e2522d8245 专病路径搜索条件 2024-04-16 15:14:25 +08:00
haown
09c3317f19 修改患者详情页面接口。 2024-04-16 14:23:10 +08:00
纪寒
07a2b6177b 院后微信小程序登录和个人信息接口开发完成 2024-04-16 14:17:14 +08:00
haown
93ae87e107 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量
 Conflicts:
	postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java
2024-04-16 09:57:11 +08:00
haown
e064c8b037 修改任务审核。 2024-04-16 09:56:09 +08:00
zhangheng
f098cd7d26 满意度信息 2024-04-15 15:51:40 +08:00
youxilong
bef0d29707 Merge branch '3.11_院后第二增量' of http:///182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-04-12 17:17:06 +08:00
youxilong
b4d7529c43 人工随访列表查询修改 2024-04-12 17:17:01 +08:00
zhangheng
8853a97ec0 问卷字段 2024-04-12 15:04:48 +08:00
zhangheng
1a2fa27b83 问卷字段 2024-04-12 14:56:11 +08:00
zhangheng
f8a808e5ba 问卷字段 2024-04-12 14:47:37 +08:00
youxilong
f57352a5d5 人工随访列表查询修改 2024-04-12 12:48:30 +08:00
youxilong
96e93196e5 修改任务管理记录列表查询 2024-04-12 10:20:01 +08:00
zhangheng
7e907edcd8 时间修改 2024-04-12 10:17:24 +08:00
youxilong
e7a4d1494d 人工随访代办查询列表返回数据新增字段 2024-04-12 10:13:31 +08:00
zhangheng
306e29477c 任务创建类型 2024-04-11 18:01:57 +08:00
haown
fb9df1c0d4 定时任务修改患者签约服务包到期状态;患者任务节点查询接口。 2024-04-11 17:21:06 +08:00
zhangheng
954935e6f4 UUID修改 2024-04-11 17:08:05 +08:00
zhangheng
66e57cad6e 任务记录 2024-04-11 16:52:39 +08:00
youxilong
c6888798d0 任务管理查询列表返回数据新增字段 2024-04-11 16:52:01 +08:00
zhangheng
42b089d79d 任务记录 2024-04-11 15:00:54 +08:00
youxilong
c1d3c5e330 修改任务管理查询列表 2024-04-11 13:44:04 +08:00
zhangheng
b66a7a8ad8 任务记录 2024-04-11 13:31:03 +08:00
haown
9661503b2b Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-04-10 17:37:45 +08:00
haown
7f75629760 修改患者任务接口。 2024-04-10 17:37:35 +08:00
youxilong
909f311f51 修改人工随访代办处理,修改根据id查询服务内容接口 2024-04-10 17:37:01 +08:00
zhangheng
be597c2af3 患者路径 2024-04-09 17:50:59 +08:00
haown
5f7e0fd1a3 删除注释。 2024-04-09 17:25:12 +08:00
haown
d3495fa180 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-04-09 17:22:42 +08:00
haown
12b0014d8f 搜索条件日期格式化,修改签约。 2024-04-09 17:22:12 +08:00
zhangheng
404010c33d 机构 2024-04-09 14:10:48 +08:00
zhangheng
263279e66d 机构 2024-04-09 14:09:53 +08:00
zhangheng
ecc349d213 机构 2024-04-09 14:06:55 +08:00
zhangheng
f539d7628e 专病路径 2024-04-09 13:24:39 +08:00
youxilong
d7f8879138 Merge branch '3.11_院后第二增量' of http:///182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-04-08 17:53:31 +08:00
youxilong
cb102a2651 修改人工随访代办处理 2024-04-08 17:53:20 +08:00
zhangheng
9166a28735 专病路径 2024-04-08 17:45:23 +08:00
zhangheng
57a73624f2 专病路径 2024-04-08 15:15:24 +08:00
youxilong
6f4a37bfa5 去掉重复数据 2024-04-08 11:30:52 +08:00
youxilong
68c3995ab9 Merge branch 'dev' into 3.11_院后第二增量
# Conflicts:
#	postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
2024-04-08 11:20:41 +08:00
youxilong
cef925deaa Merge branch '3.11_院后第二增量' of http:///182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-04-08 11:16:54 +08:00
youxilong
3514b0a62a 修改人工随访代办处理 2024-04-08 11:16:50 +08:00
zhangheng
193a3a6095 专病路径 2024-04-08 11:14:49 +08:00
haown
b357b669cd Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-04-07 17:30:29 +08:00
haown
d9008809e6 任务审核。 2024-04-07 17:30:23 +08:00
youxilong
684ff54988 人工随访代办处理 2024-04-07 17:14:44 +08:00
youxilong
e3725f2052 Merge branch '3.11_院后第二增量' of http:///182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-04-07 14:01:06 +08:00
youxilong
c2dc74922a 人工随访处理 2024-04-07 14:00:45 +08:00
zhangheng
25a9c3dd66 专病路径 2024-04-07 13:27:01 +08:00
zhangheng
763dbb5eb7 专病路径 2024-04-03 17:52:02 +08:00
haown
3a207c2d7b 修改宣教库接口。 2024-04-03 14:25:58 +08:00
haown
a4cc23f66e 修改宣教库接口。 2024-04-03 13:50:55 +08:00
haown
e3e8d8d76e 合并冲突。 2024-04-03 12:54:23 +08:00
haown
659cc4501e Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量
 Conflicts:
	postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java
	postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
	postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java
	postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/ISignPatientManageRouteService.java
	postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java
	postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
	postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
2024-04-03 12:50:47 +08:00
haown
478a003684 新增任务列表查询接口、修改宣教库统计查询接口。 2024-04-03 11:44:05 +08:00
youxilong
d4e43fa250 修改人工随访代办列表查询 2024-04-02 22:02:13 +08:00
youxilong
6d6ef3b94d 修改人工随访代办列表查询 2024-04-02 21:32:31 +08:00
youxilong
69d1a7fb82 人工随访代办列表查询 2024-04-02 17:31:44 +08:00
youxilong
f34dbc1d41 人工随访代办列表查询 2024-04-02 17:23:32 +08:00
zhangheng
f9ca8abfd8 专病路径 2024-04-02 16:55:08 +08:00
zhangheng
020c9a6f6b 专病路径 2024-04-02 13:48:24 +08:00
zhangheng
c580965139 专病路径 2024-04-01 17:13:42 +08:00
纪寒
765cfe6d7c 合并冲突处理 2024-04-01 11:06:14 +08:00
纪寒
0621f7638c Merge remote-tracking branch 'origin/3.11_院后第二增量' into dev
# Conflicts:
#	postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
#	postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
#	postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
2024-04-01 10:42:43 +08:00
纪寒
6560540c4a 格式化代码 2024-04-01 10:26:15 +08:00
haown
1a99ff2754 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-03-29 17:31:53 +08:00
haown
49412f3ba1 修改就诊记录。 2024-03-29 17:31:44 +08:00
zhangheng
1c1bbcf87c 专病路径 2024-03-29 17:26:15 +08:00
zhangheng
92238dcd2b 专病路径 2024-03-29 16:38:50 +08:00
zhangheng
3a1a013c99 患者问卷提交结果信息 2024-03-29 13:19:55 +08:00
haown
ab81503564 修改字段名。 2024-03-29 11:05:56 +08:00
haown
aab7881e27 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-03-29 11:04:58 +08:00
zhangheng
37d51adeaa 患者问卷提交结果信息 2024-03-28 17:48:09 +08:00
haown
d861d0e498 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量
 Conflicts:
	postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java
2024-03-28 17:02:28 +08:00
haown
657dbb5007 修改就诊记录、素材库管理。 2024-03-28 17:01:33 +08:00
zhangheng
05e2793de0 专病路径 2024-03-28 09:43:15 +08:00
zhangheng
5b12ac02cc 专病路径 2024-03-27 17:43:59 +08:00
zhangheng
521830bb88 任务记录 2024-03-26 17:45:29 +08:00
纪寒
b5b09e2677 公众号模板消息开发完成 2024-03-26 17:20:43 +08:00
纪寒
0db3aeb14c 患者信息表新增公众号openid字段信息 2024-03-26 14:18:34 +08:00
zhangheng
d646a62680 医院园区查询 2024-03-26 10:35:53 +08:00
纪寒
35d9a6199c 微信公众号模板消息功能配置信息参数修改 2024-03-25 17:46:41 +08:00
zhangheng
bdc1b53cb2 患者管理任务执行记录表 2024-03-25 17:24:07 +08:00
haown
e48ce05c2f Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-03-25 13:29:54 +08:00
haown
706a7e3d3a 修改字段名。 2024-03-25 13:29:44 +08:00
zhangheng
a600e4d278 推送方式 2024-03-22 17:39:26 +08:00
haown
b88fcc7f84 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-03-22 17:34:33 +08:00
haown
e8438abe59 修改就诊记录。 2024-03-22 17:34:24 +08:00
zhangheng
992405f747 推送方式 2024-03-22 09:45:47 +08:00
zhangheng
b61567b32e 节点 2024-03-20 17:47:52 +08:00
haown
badef731f1 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-03-20 16:34:19 +08:00
haown
32ca0521f9 修改字段名 2024-03-20 16:33:12 +08:00
zhangheng
5948851506 字段内容 2024-03-20 16:11:51 +08:00
haown
97fe205a65 Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量
 Conflicts:
	postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
2024-03-20 08:57:54 +08:00
haown
b0d447bdd8 修改日期格式 2024-03-20 08:56:46 +08:00