zhangheng
|
04e49febff
|
科室人员修改
|
2023-11-15 10:54:45 +08:00 |
|
haown
|
6ba40f6e31
|
update===>:修改测试问题。
|
2023-11-15 10:36:35 +08:00 |
|
haown
|
21cdddd964
|
update===>:机构增加标识区分齐鲁名医机构。
|
2023-11-14 10:22:21 +08:00 |
|
haown
|
fef182bebc
|
update===>:修改测试问题。
|
2023-11-13 17:33:05 +08:00 |
|
haown
|
6b0bf514e3
|
update===>:合并冲突。
|
2023-11-10 17:36:44 +08:00 |
|
haown
|
58263e19d6
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
Conflicts:
xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java
xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/MessageSearchDto.java
xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/impl/ChatRecordServiceImpl.java
|
2023-11-10 17:35:08 +08:00 |
|
haown
|
54b750f853
|
update===>:消息中心。
|
2023-11-10 17:31:50 +08:00 |
|
zhangheng
|
314310a425
|
服务评价
|
2023-11-10 09:48:36 +08:00 |
|
HaoWang
|
50ddc45c9f
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-11-09 14:00:00 +08:00 |
|
HaoWang
|
91c6525ca7
|
修改已读状态功能
|
2023-11-09 13:59:42 +08:00 |
|
mengkuiliang
|
d0a987b84e
|
修改bug
|
2023-11-09 10:42:25 +08:00 |
|
mengkuiliang
|
40900ff82c
|
根据前端统一请求头中region参数
|
2023-11-09 10:27:18 +08:00 |
|
纪寒
|
1cfd0684e8
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-11-08 17:02:19 +08:00 |
|
纪寒
|
d3cc7b4001
|
测试问题代码修改
|
2023-11-08 17:02:12 +08:00 |
|
zhangheng
|
9c9bc2542c
|
新人福利优惠券领取
|
2023-11-08 16:40:58 +08:00 |
|
haown
|
b02fc13a63
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-11-08 14:28:13 +08:00 |
|
haown
|
cdd5e2ea96
|
update===>:修改数据查询范围。
|
2023-11-08 14:28:04 +08:00 |
|
HaoWang
|
e81affd7ed
|
更改字符串非空校验
|
2023-11-08 10:36:30 +08:00 |
|
HaoWang
|
f5580afe0a
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-11-08 09:35:27 +08:00 |
|
HaoWang
|
d5513d193b
|
优化图片问诊代码
|
2023-11-08 09:34:47 +08:00 |
|
mengkuiliang
|
42c0ab8e00
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-11-07 17:39:10 +08:00 |
|
mengkuiliang
|
c756ba39a3
|
解决测试中出现的问题；
|
2023-11-07 17:39:06 +08:00 |
|
zhangheng
|
f9391589fd
|
护理员app新增代码
|
2023-11-07 15:42:22 +08:00 |
|
纪寒
|
9af9df10b7
|
测试问题代码修改
|
2023-11-07 15:21:23 +08:00 |
|
纪寒
|
bb69917dc6
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-11-07 14:54:59 +08:00 |
|
纪寒
|
1bf1319f16
|
测试问题代码修改
|
2023-11-07 14:54:45 +08:00 |
|
zhangheng
|
72ccb547b5
|
新增护理站生成二维码
|
2023-11-07 14:23:58 +08:00 |
|
haown
|
35318d8ca8
|
update===>:修改视频问诊。
|
2023-11-07 11:33:06 +08:00 |
|
haown
|
9619439cd8
|
update===>:修改代码路径。
|
2023-11-02 11:45:12 +08:00 |
|
haown
|
87a8ba5820
|
update===>:修改消息推送。
|
2023-11-02 11:12:15 +08:00 |
|
赵旭
|
7bce05f186
|
筛查分析
|
2023-10-30 14:04:06 +08:00 |
|
zhangheng
|
c6d6eeeb19
|
Merge remote-tracking branch 'origin/dev_gy_0920' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
# Conflicts:
# xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java
# xinelu-familydoctor/pom.xml
# xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
# xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
|
2023-10-30 11:17:44 +08:00 |
|
zhangheng
|
8000fbc1a1
|
pc端科室人员代码格式化
|
2023-10-27 15:35:40 +08:00 |
|
纪寒
|
9b4d753a1a
|
接口白名单修改
|
2023-10-27 15:23:14 +08:00 |
|
mengkuiliang
|
ff59eeb12c
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-27 14:45:35 +08:00 |
|
zhangheng
|
9ba5b7f7ca
|
pc端订单信息修改
|
2023-10-27 10:29:39 +08:00 |
|
haown
|
a08846f797
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-26 16:13:32 +08:00 |
|
haown
|
1940d9f950
|
update===>:修改医生排班接口。
|
2023-10-26 16:13:26 +08:00 |
|
zhengheng
|
9d91b84d29
|
pc端订单信息修改
|
2023-10-26 11:02:12 +08:00 |
|
mengkuiliang
|
6f499cd4a5
|
添加获取指定类型的消息记录接口；
|
2023-10-25 17:23:00 +08:00 |
|
mengkuiliang
|
dc1b4c681e
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
# Conflicts:
# xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java
# xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java
# xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java
# xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml
|
2023-10-25 14:44:37 +08:00 |
|
mengkuiliang
|
343527df23
|
添加家医pc端健康知识推送相关接口；
|
2023-10-25 14:39:31 +08:00 |
|
mengkuiliang
|
c399e2e922
|
家医消息通知接口修改
|
2023-10-25 11:05:08 +08:00 |
|
赵旭
|
b285e99460
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-24 16:33:22 +08:00 |
|
赵旭
|
9d80ec4800
|
app医生个人信息添加sex性别
|
2023-10-24 16:33:18 +08:00 |
|
HaoWang
|
6558870cde
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-24 16:07:41 +08:00 |
|
HaoWang
|
ea1f535f2c
|
问诊列表返回最后一条聊天记录和类型
|
2023-10-24 16:07:17 +08:00 |
|
赵旭
|
b70cd5d87c
|
登录返回用户区分状态
|
2023-10-24 15:40:27 +08:00 |
|
mengkuiliang
|
7dd7d1c2d7
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-24 14:36:17 +08:00 |
|
haown
|
17145f6242
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
Conflicts:
xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java
|
2023-10-24 14:32:54 +08:00 |
|