Commit Graph

62 Commits

Author SHA1 Message Date
mengkuiliang
40900ff82c 根据前端统一请求头中region参数 2023-11-09 10:27:18 +08:00
纪寒
d3cc7b4001 测试问题代码修改 2023-11-08 17:02:12 +08:00
mengkuiliang
a4985bbf4b 代码修改 2023-11-08 10:14:46 +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
HaoWang
96102e95cd Merge remote-tracking branch 'origin/dev_gy_0920' into dev_gy_0920 2023-10-27 11:08:24 +08:00
HaoWang
d60716f02e 完善健康自评答案提交 2023-10-27 11:00:23 +08:00
mengkuiliang
8b548ac3ba 迁移德州市鲁通码接口; 2023-10-26 09:11:30 +08:00
mengkuiliang
343527df23 添加家医pc端健康知识推送相关接口; 2023-10-25 14:39:31 +08:00
gaoyu
f8a08aaa80 体征检测接口调整 2023-10-20 17:38:45 +08:00
mengkuiliang
e83666f45a 添加 家医用户同步小程序科室人员信息 接口; 2023-10-20 17:08:31 +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
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
纪寒
8af9f2edf8 商城相关功能代码移植 2023-10-16 15:00:16 +08:00
李甲辉
f4d3bf9a3b 富文本图片回显 2023-10-16 13:08:49 +08:00
mengkuiliang
611379accf Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920 2023-10-16 09:04:00 +08:00
mengkuiliang
4023b7fbef 添加服务记录接口;
获取签约协议接口修改;
2023-10-16 09:03:16 +08:00
haown
c1376ea982 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 2023-10-13 16:01:42 +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
赵旭
c6aa56e954 修改小程序注册bug 2023-10-13 13:11:53 +08:00
赵旭
db302aa2ad 修改微信登录验证是否已注册 2023-10-13 10:00:38 +08:00
mengkuiliang
25bcc18232 签约申请文件上传接口优化; 2023-10-13 09:09:29 +08:00
mengkuiliang
87cd158270 1、添加获取家医人群、根据人群获取服务包、获取签约协议接口;
2、添加签约申请居民签字上传接口;
3、添加签约周期字段;
2023-10-12 17:34:47 +08:00
mengkuiliang
76f2680694 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 2023-10-11 16:09:29 +08:00
mengkuiliang
c21c7373b5 修改代码; 2023-10-11 16:08:54 +08:00
mengkuiliang
31f7740e7c 解决调试过程中出现的问题; 2023-10-11 14:29:34 +08:00
张恒
b2451f91e9 管理端富文本上传代码移植 2023-10-11 11:26:05 +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
7adde383cd Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920 2023-10-10 09:13:33 +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
gaoyu
7707af2ab7 设备绑定及体征检测接口 2023-10-09 11:18:06 +08:00
mengkuiliang
52ba21ab35 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 2023-10-09 11:14:18 +08:00
mengkuiliang
3927b467a5 添加获取家医个性服务包和筛查项目接口 2023-10-09 11:12:06 +08:00
张恒
0c1b72c9a5 小程序登录移植 2023-10-08 17:33:19 +08:00
mengkuiliang
25a7771c03 添加服务申请相关接口; 2023-10-08 14:17:23 +08:00
mengkuiliang
e42bc824da 添加签约审核、解约审核、解约申请列表家医调用接口;
修改字段名;
2023-09-28 17:35:28 +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