Commit Graph

56 Commits

Author SHA1 Message Date
haown
87a8ba5820 update===>:修改消息推送。 2023-11-02 11:12:15 +08:00
mengkuiliang
fb74d33304 解决patient_info表中openid唯一性问题,修改注册、切换账号等接口; 2023-10-31 13:56:32 +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
mengkuiliang
4909c828ee 注册完善信息时,同步居民收货地址表信息 2023-10-27 15:34: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
HaoWang
ce9119ef4a 完善健康自评xml 2023-10-27 09:50:26 +08:00
mengkuiliang
8b548ac3ba 迁移德州市鲁通码接口; 2023-10-26 09:11:30 +08:00
mengkuiliang
6f499cd4a5 添加获取指定类型的消息记录接口; 2023-10-25 17:23:00 +08:00
mengkuiliang
c399e2e922 家医消息通知接口修改 2023-10-25 11:05:08 +08:00
mengkuiliang
366cd7b1e1 小程序个人中心添加更新签约编号 2023-10-24 09:03:00 +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
gaoyu
f8a08aaa80 体征检测接口调整 2023-10-20 17:38:45 +08:00
mengkuiliang
e83666f45a 添加 家医用户同步小程序科室人员信息 接口; 2023-10-20 17:08:31 +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
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
赵旭
81e129fc6d Merge remote-tracking branch 'origin/dev_gy_0920' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-17 09:38:23 +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
纪寒
343f072673 Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-16 17:00:49 +08:00
纪寒
8af9f2edf8 商城相关功能代码移植 2023-10-16 15:00:16 +08:00
赵旭
78b8f9c721 合并代码冲突 2023-10-16 14:37:56 +08:00
赵旭
037d6b3f66 Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
# Conflicts:
#	xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/mapper/ResidentPatientInfoMapper.java
#	xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
2023-10-16 14:31:51 +08:00
赵旭
3bf848721f 注册返回绑定城市 2023-10-16 14:28:01 +08:00
张恒
138f6f1dfb 注册修改 2023-10-16 14:24:58 +08:00
张恒
14055eaf2f 注册修改 2023-10-16 13:47:32 +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
赵旭
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
c21c7373b5 修改代码; 2023-10-11 16:08:54 +08:00
mengkuiliang
31f7740e7c 解决调试过程中出现的问题; 2023-10-11 14:29:34 +08:00
mengkuiliang
d7e5267293 代码优化; 2023-10-10 14:40:09 +08:00
mengkuiliang
43b0a22561 1、修改获取服务预约列表接口;
2、修改其他代码;
2023-10-10 11:14:30 +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
gaoyu
7707af2ab7 设备绑定及体征检测接口 2023-10-09 11:18:06 +08:00
mengkuiliang
3927b467a5 添加获取家医个性服务包和筛查项目接口 2023-10-09 11:12:06 +08:00
mengkuiliang
25a7771c03 添加服务申请相关接口; 2023-10-08 14:17:23 +08:00
mengkuiliang
e42bc824da 添加签约审核、解约审核、解约申请列表家医调用接口;
修改字段名;
2023-09-28 17:35:28 +08:00
mengkuiliang
60ac53e173 修改注册接口实现 2023-09-28 13:44:54 +08:00
mengkuiliang
75ef1415ad Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920
# Conflicts:
#	xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
2023-09-28 11:42:57 +08:00