Commit Graph

236 Commits

Author SHA1 Message Date
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
zhangheng
7b11884c74 小程序信息查询接口修改 2023-11-07 13:29:47 +08:00
haown
35318d8ca8 update===>:修改视频问诊。 2023-11-07 11:33:06 +08:00
zhangheng
169038c60a 小程序医生信息查询接口修改 2023-11-03 16:21:25 +08:00
zhangheng
b52acef638 小程序医生信息查询接口修改 2023-11-03 15:27:30 +08:00
zhangheng
006981a1d7 小程序订单信息修改 2023-11-02 17:31:54 +08:00
haown
9619439cd8 update===>:修改代码路径。 2023-11-02 11:45:12 +08:00
haown
31be3272bd Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-11-02 11:12:21 +08:00
haown
87a8ba5820 update===>:修改消息推送。 2023-11-02 11:12:15 +08:00
zhangheng
7f26ccc8d2 小程序订单信息修改 2023-11-02 10:16:45 +08:00
haown
4e0844558d update===>:修改生成房间号方法及推送房间号。 2023-11-02 09:35:47 +08:00
zhangheng
2ebe1e1ece 小程序订单信息修改搜索条件 2023-11-01 17:30:07 +08:00
zhangheng
c6d384cc57 小程序订单信息删除冗余代码 2023-11-01 10:26:27 +08:00
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