Commit Graph

524 Commits

Author SHA1 Message Date
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
纪寒
317e38e594 小程序消息订阅微信对接代码开发完成 2024-03-19 17:19:49 +08:00
zhangheng
22c2446b35 触发条件 2024-03-19 15:55:34 +08:00
纪寒
0c1c45088f 小程序消息订阅通知结果代码生成 2024-03-19 11:14:22 +08:00
youxilong
8e8e40bc1e 修改注释格式 2024-03-19 10:55:10 +08:00
纪寒
2655be7e39 小程序消息订阅通知代码生成 2024-03-19 10:48:11 +08:00
youxilong
b7833f1fda Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-03-19 10:29:31 +08:00
youxilong
dac6412d6c 补充枚举类 2024-03-19 10:29:15 +08:00
haown
410f5a8b07 合并冲突 2024-03-19 09:17:23 +08:00
haown
49d0133211 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/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java
	postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java
2024-03-19 09:13:12 +08:00
haown
cb1337df60 增加签约管理路径相关接口。 2024-03-19 09:05:52 +08:00
youxilong
8ed5796704 注释格式修改 2024-03-18 18:48:53 +08:00
zhangheng
f5cdb33bed 时间格式修改 2024-03-18 16:48:57 +08:00
zhangheng
3d5fb44c4b 合并dev时间格式 2024-03-18 16:39:58 +08:00
zhangheng
151ecf36a0 Merge remote-tracking branch 'origin/dev' into 3.11_院后第二增量 2024-03-18 16:38:59 +08:00
zhangheng
9714c58f46 触发条件 2024-03-18 16:37:51 +08:00
纪寒
2da3f2d6d8 日期格式修改 2024-03-18 16:36:19 +08:00
zhangheng
220ede4495 专病路径管理 2024-03-18 14:13:15 +08:00
zhangheng
dcb5144533 修改 2024-03-15 15:25:27 +08:00
haown
968d3547e0 Merge remote-tracking branch 'origin/youxilong_2.26_院后第一增量' into 3.11_院后第二增量
# Conflicts:
#	postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
2024-03-13 17:25:20 +08:00
haown
2090db0020 检测项目、就诊记录相关接口 2024-03-13 17:20:01 +08:00
zhangheng
91ddacc575 修改 2024-03-13 14:17:01 +08:00
zhangheng
4abbaa2bdd 管理节点信息表 2024-03-13 11:49:58 +08:00
zhangheng
b99fa2c0c7 任务状态 2024-03-13 11:34:56 +08:00
zhangheng
41a63e5fdf 任务类型及状态 2024-03-12 11:46:06 +08:00
haown
cca1a66e13 检测项目接口 2024-03-12 10:29:09 +08:00
youxilong
94890fe73b Merge branch '3.11_院后第二增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量 2024-03-11 17:50:31 +08:00
youxilong
c07584dbd7 1.字段信息的查询、新增、修改、删除初步完成
2.字段内容的查询、新增、修改、删除初步完成
2024-03-11 17:50:27 +08:00
zhangheng
b14182c17a 任务细分字段表 2024-03-11 15:53:35 +08:00
youxilong
16df3d8757 第二增量分支初始化 2024-03-11 09:42:04 +08:00
youxilong
d2a3bae961 合并分支 2024-03-11 09:39:16 +08:00
youxilong
681fb980c2 服务内容修改时使用枚举类 2024-03-08 16:03:37 +08:00
youxilong
58c54e6fd3 修改话术更新接口 2024-03-08 11:25:33 +08:00
youxilong
d53f70fd82 修改服务方式删除接口 2024-03-08 09:30:26 +08:00
youxilong
2b8385b1aa Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-03-07 17:22:35 +08:00
youxilong
665aa13b18 修改话术接口修改 2024-03-07 17:22:17 +08:00
zhangheng
75f17168bb 修改 2024-03-07 16:58:43 +08:00
zhangheng
9bceb89239 修改 2024-03-07 16:54:07 +08:00
youxilong
fb2c010927 修改短信模板显示条数错误 2024-03-07 14:58:14 +08:00
youxilong
bec524dfc4 Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-03-07 13:33:06 +08:00
youxilong
ee0947452d 修改微信列表分页total数据错误 2024-03-07 13:32:47 +08:00
zhangheng
29b6ad4d66 修改 2024-03-07 13:30:57 +08:00
zhangheng
7df8307c3c 病种修改 2024-03-07 10:53:16 +08:00
youxilong
32fdc1b969 修改服务包内容配置中服务频次修改后数据回显问题 2024-03-07 10:43:55 +08:00
zhangheng
a31d740f3a 病种修改 2024-03-07 09:18:23 +08:00
youxilong
f71b0b426a Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-03-06 17:58:50 +08:00
youxilong
56d9f7a4ab 修改服务包内容配置修改接口 2024-03-06 17:58:36 +08:00
zhangheng
1e71dfff1c 问卷 2024-03-06 17:55:43 +08:00
zhangheng
62b6d99c23 问卷 2024-03-06 15:44:23 +08:00
zhangheng
4552919c34 代码校验 2024-03-06 13:53:37 +08:00
youxilong
af78ce0cde Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-03-06 13:22:08 +08:00
youxilong
d9f279dc8d 修改微信模板修改和短信模板修改接口 2024-03-06 13:21:52 +08:00
zhangheng
73e53d1df7 代码校验 2024-03-06 13:12:11 +08:00
haown
cc0d42c080 Merge branch 'youxilong_2.26_院后第一增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量
 Conflicts:
	postdischarge-common/src/main/java/com/xinelu/common/config/SystemBusinessConfig.java
2024-03-06 08:47:14 +08:00
youxilong
22d27660df 修改话术信息接口,话术库图片上传 2024-03-05 18:04:09 +08:00
haown
6d1c28e569 患者签约相关接口。 2024-03-05 17:30:49 +08:00
youxilong
89dd838af3 Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-03-04 17:32:35 +08:00
youxilong
560551791c 查询服务包,删除服务包及服务内容,根据服务包id查询详情 2024-03-04 17:32:03 +08:00
zhangheng
52de6173d1 问卷 2024-03-04 16:05:11 +08:00
youxilong
19e10ea376 查询科室列表和服务包数量,查询服务包列表 2024-03-03 22:16:01 +08:00
youxilong
70733b7d71 Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-03-01 18:01:13 +08:00
youxilong
db92053279 修改服务包内容查询接口 2024-03-01 18:00:52 +08:00
zhangheng
d7284dbbdb 问卷 2024-03-01 17:46:19 +08:00
zhangheng
4e1df448ac 医院园区科室联动 2024-03-01 16:12:29 +08:00
zhangheng
7f01dca60f 医院园区科室联动 2024-03-01 15:56:38 +08:00
zhangheng
578bbd54f1 问卷修改 2024-03-01 15:00:08 +08:00
youxilong
e00df9fab2 Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-03-01 11:23:18 +08:00
youxilong
77342ed291 修改查询服务方式和服务内容接口 2024-03-01 11:22:47 +08:00
zhangheng
ed18d0fc72 用户修改 2024-03-01 11:21:18 +08:00
youxilong
92f4b9a611 服务包内容配置:查询服务方式列表及其服务内容列表接口 2024-02-29 22:23:20 +08:00
youxilong
e45bcd2901 Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-02-29 16:33:20 +08:00
youxilong
49c61f3890 短信库修改,微信库修改接口修改 2024-02-29 16:32:46 +08:00
haown
5412d0f8c4 去掉错误文件 2024-02-29 13:54:25 +08:00
haown
4a60626e66 Merge branch 'youxilong_2.26_院后第一增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-02-29 13:51:37 +08:00
haown
458fe51b68 修改文件路径 2024-02-29 13:51:32 +08:00
youxilong
7cc368001f Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-02-29 13:03:21 +08:00
youxilong
06674e8275 修改短信库、微信库查询列表和获取详细信息 2024-02-29 13:02:34 +08:00
haown
b79d93bf82 Merge remote-tracking branch 'origin/dev' into youxilong_2.26_院后第一增量
# Conflicts:
#	postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
#	postdischarge-manage/src/main/java/com/xinelu/manage/dto/ManageTestDTO.java
2024-02-29 11:43:46 +08:00
haown
3f278c3cb4 签约管理 2024-02-29 11:40:18 +08:00
zhangheng
74e8d80854 问卷题目及答案 2024-02-29 11:25:59 +08:00
youxilong
9a090e27d7 添加短信库管理相关接口Swagger注解 2024-02-29 09:36:50 +08:00
youxilong
326db20b10 Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量 2024-02-29 08:57:23 +08:00
youxilong
d64d15661b 修改短信库管理、微信库管理相关接口 2024-02-29 08:53:34 +08:00
zhangheng
293e8b0257 科室上级科室信息 2024-02-28 16:34:23 +08:00
zhangheng
de03286f27 机构行政区域 2024-02-28 16:12:51 +08:00
youxilong
8726639e80 修改DepartMent类 2024-02-28 15:46:51 +08:00
youxilong
e33553cf38 修改DepartMent类 2024-02-28 15:37:45 +08:00
youxilong
5f28ec44da 短信库管理初始接口 2024-02-28 15:20:32 +08:00
youxilong
087d9516bf 增加DepartmentVo,修改查询科室及其下属手术、话术、微信库数量 2024-02-28 15:18:17 +08:00
zhangheng
3ab9d2a39c 科室导入及标准科室 2024-02-28 15:10:58 +08:00
youxilong
8f31ab72b8 修改查询科室及其下属数量 2024-02-28 14:57:17 +08:00
youxilong
59c15fc438 增加微信控制器以及入参Swagger注解 2024-02-28 14:07:57 +08:00
youxilong
9dfe13a0bc 修改查询科室及其下属手术、话术、微信库数量 2024-02-28 13:48:41 +08:00
youxilong
902e8e40dd Merge remote-tracking branch 'origin/youxilong_2.26_院后第一增量' into youxilong_2.26_院后第一增量 2024-02-28 13:19:08 +08:00
youxilong
942a235f7d 微信模板新增,修改,查询,删除 2024-02-28 13:17:18 +08:00
youxilong
b1518f44a2 查询科室及其下属话术、手术数量信息,手术管理模块修改,话术管理模块修改 2024-02-28 13:06:05 +08:00
zhangheng
b979884e85 细分增加 2024-02-28 11:07:30 +08:00
zhangheng
9fecec238a 修改 2024-02-28 10:19:56 +08:00
zhangheng
7e4e183993 区域修改 2024-02-27 18:03:31 +08:00
zhangheng
aff9c75d6b 导入修改 2024-02-27 15:36:30 +08:00
zhangheng
ff2adb4396 机构删除修改 2024-02-27 15:29:54 +08:00
zhangheng
df838d2b3b 导入及树图修改 2024-02-27 15:13:42 +08:00
haown
95d06bbceb 患者管理 2024-02-27 14:04:33 +08:00
zhangheng
f8b4e26afc 科室信息修改 2024-02-27 09:30:39 +08:00
youxilong
a52bbd168e 话术库管理:查询话术信息列表,新增话术信息,获取话术信息详细信息 2024-02-26 17:54:25 +08:00
zhangheng
8ff37f7d4f 科室信息表 2024-02-26 17:48:30 +08:00
zhangheng
32501a5ad2 科室病种信息表 2024-02-26 17:25:16 +08:00
zhangheng
a65481f7df 区域代码查询下级 2024-02-26 16:43:29 +08:00
zhangheng
47a1b7747d 区域代码查询下级 2024-02-26 16:15:48 +08:00
zhangheng
1b56b32f63 机构代码初始化 2024-02-26 15:30:45 +08:00
youxilong
86245219ac 手术名称管理模块:查询手术信息列表,获取手术信息详细信息,新增、修改、删除手术信息 2024-02-26 14:38:46 +08:00
youxilong
d4db6a8397 由希龙初始dev分支 2024-02-26 09:10:43 +08:00
纪寒
b5efd23faf 新增业务PC端和移动端模块 2024-02-18 17:08:31 +08:00