纪寒
|
2cb9bebd60
|
订单培训订单功能修改
|
2023-11-28 14:01:39 +08:00 |
|
HaoWang
|
907fb39097
|
学习培训/我的学习
|
2023-11-28 10:50:28 +08:00 |
|
zhangheng
|
8fbac0aa4c
|
学习培训
|
2023-11-24 14:22:54 +08:00 |
|
haown
|
dde8800b09
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-11-14 08:48:52 +08:00 |
|
haown
|
fef182bebc
|
update===>:修改测试问题。
|
2023-11-13 17:33:05 +08:00 |
|
mengkuiliang
|
27b47ab841
|
签约申请添加cityCode字段，根据地市判断签约状态。
|
2023-11-13 17:22:04 +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 |
|
haown
|
cdd5e2ea96
|
update===>:修改数据查询范围。
|
2023-11-08 14:28:04 +08:00 |
|
haown
|
35318d8ca8
|
update===>:修改视频问诊。
|
2023-11-07 11:33:06 +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 |
|
HaoWang
|
ea1f535f2c
|
问诊列表返回最后一条聊天记录和类型
|
2023-10-24 16:07:17 +08:00 |
|
mengkuiliang
|
1379142381
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
# Conflicts:
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/orderevaluateinfo/OrderEvaluateInfoController.java
|
2023-10-20 10:45:51 +08:00 |
|
mengkuiliang
|
3775e9ca7e
|
1、添加家医发送微信订阅消息接口；
2、签约审核、解约审核、服务申请、筛查项目预约添加微信订阅消息提醒；
3、修改其他问题；
|
2023-10-20 10:41:06 +08:00 |
|
纪寒
|
7fcf37c42f
|
医生App端医生拒接专家咨询订单接口开发
|
2023-10-19 17:22:10 +08:00 |
|
mengkuiliang
|
65b017c383
|
Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920
|
2023-10-18 17:34:03 +08:00 |
|
mengkuiliang
|
1002c6c2fc
|
1、修改服务评价接口；
2、添加获取服务评价列表接口；
3、居民信息表添加签约编号字段；
|
2023-10-18 17:33:58 +08:00 |
|
纪寒
|
49f8ff022f
|
删除医路修改微信商户号相关配置和业务逻辑
|
2023-10-18 15:03:21 +08:00 |
|
gaoyu
|
b15520a6bd
|
问卷自评功能
|
2023-10-18 14:11:08 +08:00 |
|
mengkuiliang
|
faf39a056b
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
# Conflicts:
# xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/orderevaluateinfo/OrderEvaluateInfo.java
# xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluateinfo/OrderEvaluateInfoMapper.xml
|
2023-10-17 16:33:42 +08:00 |
|
mengkuiliang
|
ca0611cbb5
|
评价表添加字段；
服务记录接口修改；
居民信息添加户主相关字段；
|
2023-10-17 15:58:26 +08:00 |
|
haown
|
80ad657015
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-17 08:50:52 +08:00 |
|
纪寒
|
3b6c9994dd
|
商城相关功能代码移植
|
2023-10-16 17:00:31 +08:00 |
|
纪寒
|
8af9f2edf8
|
商城相关功能代码移植
|
2023-10-16 15:00:16 +08:00 |
|
纪寒
|
c8228e64d2
|
实体类和Mapper文件添加数据库新增字段
|
2023-10-16 13:52:10 +08:00 |
|
haown
|
3f0902a7da
|
Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920
Conflicts:
xinelu-admin/src/main/resources/application.yml
|
2023-10-13 15:43:18 +08:00 |
|
haown
|
a194bfc947
|
update===>:修改筛查相关接口。
|
2023-10-13 15:42:10 +08:00 |
|
mengkuiliang
|
76f2680694
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-11 16:09:29 +08:00 |
|
mengkuiliang
|
31f7740e7c
|
解决调试过程中出现的问题；
|
2023-10-11 14:29:34 +08:00 |
|
张恒
|
c3d39648e8
|
Merge remote-tracking branch 'origin/dev_gy_0920' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-11 11:01:41 +08:00 |
|
张恒
|
f46aba9389
|
PC订单评价代码移植，小程序完善信息移植
|
2023-10-11 10:45:47 +08:00 |
|
haown
|
30a2b87777
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-10 14:12:02 +08:00 |
|
张恒
|
4789e33f2a
|
字段修改
|
2023-10-10 11:40:01 +08:00 |
|
mengkuiliang
|
151dae3aff
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
# Conflicts:
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningproject/ScreeningProjectController.java
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningproject/ScreeningProject.java
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningproject/ScreeningProjectMapper.java
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningproject/impl/ScreeningProjectServiceImpl.java
# xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml
|
2023-10-10 11:17:01 +08:00 |
|
haown
|
fa110601b4
|
update===>:修改筛查相关文件上传。
|
2023-10-10 11:09:01 +08:00 |
|
haown
|
9ba3a31af1
|
update===>:修改筛查相关接口。
|
2023-10-09 14:35:08 +08:00 |
|
mengkuiliang
|
29d37f02c1
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
# Conflicts:
# pom.xml
# xinelu-admin/src/main/resources/application.yml
# xinelu-common/src/main/java/com/xinelu/common/utils/http/HttpUtils.java
# xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java
|
2023-09-28 11:39:38 +08:00 |
|
mengkuiliang
|
09430318bd
|
1、添加随访记录接口；
2、添加解约申请相关接口；
|
2023-09-28 10:50:55 +08:00 |
|
mengkuiliang
|
618d08665a
|
添加签约申请相关接口；
调整分页配置；
|
2023-09-27 16:44:25 +08:00 |
|
HaoWang
|
b072fb0d05
|
图文问诊和聊天记录代码优化
|
2023-09-26 14:52:41 +08:00 |
|
张恒
|
05fa888bbe
|
小程序代码移植
|
2023-09-26 10:44:29 +08:00 |
|
mengkuiliang
|
ac687bc8a3
|
1、添加注册接口；
2、添加行为积分接口；
3、请求白名单修改为配置文件的方式；
4、升级swagger文档；
5、添加微信小程序、家医接口配置；
|
2023-09-25 18:05:41 +08:00 |
|
纪寒
|
333431d14a
|
PC端-小程序商城模块移植，个人中心积分相关移植
|
2023-09-22 16:44:36 +08:00 |
|
haown
|
71b5741d57
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://101.200.89.70:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-09-22 08:52:33 +08:00 |
|
haown
|
f77b1815bf
|
add===>:增加医生排班、视频问诊、websocket。
|
2023-09-22 08:52:24 +08:00 |
|
张恒
|
fe29cd6bd1
|
小程序护理机构代码移植
|
2023-09-21 17:23:23 +08:00 |
|
haown
|
e8f6a27df4
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://101.200.89.70:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
Conflicts:
xinelu-nurse-manage/pom.xml
|
2023-09-21 17:12:38 +08:00 |
|
haown
|
0997c0a5d1
|
add===>:移植专病筛查模块
|
2023-09-21 17:11:12 +08:00 |
|
HaoWang
|
5822d68a75
|
系统规则设置、预约订单、商品订单代码移植
|
2023-09-21 15:57:25 +08:00 |
|
张恒
|
775f2d4cfa
|
小程序护理机构代码移植
|
2023-09-21 15:37:50 +08:00 |
|