Commit Graph

28 Commits

Author SHA1 Message Date
纪寒
d3cc7b4001 测试问题代码修改 2023-11-08 17:02:12 +08:00
haown
35318d8ca8 update===>:修改视频问诊。 2023-11-07 11:33:06 +08:00
mengkuiliang
8b548ac3ba 迁移德州市鲁通码接口; 2023-10-26 09:11:30 +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
纪寒
49f8ff022f 删除医路修改微信商户号相关配置和业务逻辑 2023-10-18 15:03:21 +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
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
纪寒
8af9f2edf8 商城相关功能代码移植 2023-10-16 15:00:16 +08:00
李甲辉
f4d3bf9a3b 富文本图片回显 2023-10-16 13:08:49 +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
31f7740e7c 解决调试过程中出现的问题; 2023-10-11 14:29:34 +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
mengkuiliang
43b0a22561 1、修改获取服务预约列表接口;
2、修改其他代码;
2023-10-10 11:14:30 +08:00
haown
fa110601b4 update===>:修改筛查相关文件上传。 2023-10-10 11:09:01 +08:00
mengkuiliang
96cfedc1db 添加服务预约相关接口;修改注册接口; 2023-10-10 09:13:30 +08:00
haown
3bcc435d29 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-09 14:35:10 +08:00
haown
9ba3a31af1 update===>:修改筛查相关接口。 2023-10-09 14:35:08 +08:00
mengkuiliang
52ba21ab35 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 2023-10-09 11:14:18 +08:00
张恒
0c1b72c9a5 小程序登录移植 2023-10-08 17:33:19 +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
HaoWang
b072fb0d05 图文问诊和聊天记录代码优化 2023-09-26 14:52:41 +08:00
张恒
05fa888bbe 小程序代码移植 2023-09-26 10:44:29 +08:00
HaoWang
6f07765227 yml添加文件上传路径 2023-09-26 09:17:19 +08:00
mengkuiliang
ac687bc8a3 1、添加注册接口;
2、添加行为积分接口;
3、请求白名单修改为配置文件的方式;
4、升级swagger文档;
5、添加微信小程序、家医接口配置;
2023-09-25 18:05:41 +08:00
haown
f77b1815bf add===>:增加医生排班、视频问诊、websocket。 2023-09-22 08:52:24 +08:00
纪寒
1e83280465 新版小程序后端首次提交 2023-09-19 11:43:54 +08:00