Commit Graph

314 Commits

Author SHA1 Message Date
zhangheng
ae67d61671 小程序专家咨询订单修改 2023-11-01 09:17:32 +08:00
纪寒
3d0050d46b 代码修改 2023-10-31 16:37:19 +08:00
mengkuiliang
fb74d33304 解决patient_info表中openid唯一性问题,修改注册、切换账号等接口; 2023-10-31 13:56:32 +08:00
赵旭
7bce05f186 筛查分析 2023-10-30 14:04:06 +08:00
zhangheng
d3f31d08b9 代码合并 2023-10-30 11:36:42 +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
纪寒
d1d96b32a5 取消订单接口移植 2023-10-27 16:07:27 +08:00
zhangheng
e682722d5f 小程序领取优惠券 2023-10-27 15:59:49 +08:00
zhangheng
3c39f44dc1 Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-27 15:35:56 +08:00
zhangheng
8000fbc1a1 pc端科室人员代码格式化 2023-10-27 15:35:40 +08:00
mengkuiliang
dde778ce8c Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-27 15:34:21 +08:00
mengkuiliang
4909c828ee 注册完善信息时,同步居民收货地址表信息 2023-10-27 15:34:15 +08:00
纪寒
637e0ddfd5 接口白名单修改 2023-10-27 15:25:37 +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
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
zhangheng
9ba5b7f7ca pc端订单信息修改 2023-10-27 10:29:39 +08:00
HaoWang
ce9119ef4a 完善健康自评xml 2023-10-27 09:50:26 +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
8b548ac3ba 迁移德州市鲁通码接口; 2023-10-26 09:11:30 +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
作者1
e32e79c496 测试 2023-10-24 17:04:38 +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
haown
c29010f679 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-24 16:15:52 +08:00
haown
b70d796a59 update===>:去除多余代码。 2023-10-24 16:15:43 +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
haown
7d67518928 update===>:修改消息接口。 2023-10-24 15:33:41 +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
haown
9ab954365c add===>:增加修改工单状态接口,消息中心接口移植。 2023-10-24 14:30:52 +08:00
mengkuiliang
64b686ae6e 代码提交 2023-10-24 09:45:16 +08:00
mengkuiliang
366cd7b1e1 小程序个人中心添加更新签约编号 2023-10-24 09:03:00 +08:00
mengkuiliang
5adce2514b Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 2023-10-23 14:11:27 +08:00
赵旭
0aeb082eff 添加筛查统计 2023-10-23 14:07:53 +08:00
mengkuiliang
1e237d11fc Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920 2023-10-23 09:23:39 +08:00
mengkuiliang
5c84d8a7cf 代码提交 2023-10-23 09:23:33 +08:00
赵旭
1d86f99afa Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-23 08:56:53 +08:00
gaoyu
f8a08aaa80 体征检测接口调整 2023-10-20 17:38:45 +08:00
mengkuiliang
962c4f0715 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 2023-10-20 17:11:03 +08:00
mengkuiliang
e83666f45a 添加 家医用户同步小程序科室人员信息 接口; 2023-10-20 17:08:31 +08:00
张恒
fdd2b195d1 小程序服务评价代码修改 2023-10-20 16:30:27 +08:00