Commit Graph

195 Commits

Author SHA1 Message Date
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
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
张恒
dea1bd6bc3 小程序服务评价代码修改 2023-10-20 16:24:30 +08:00
张恒
1869987d7b 小程序服务评价代码修改 2023-10-20 16:22:09 +08:00
haown
1105f1eb34 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-20 15:44:27 +08:00
haown
765c588098 update===>:APP工单列表。 2023-10-20 15:44:09 +08:00
张恒
bf84a29a37 小程序服务评价代码修改 2023-10-20 14:03:32 +08:00
张恒
d7dab603ee 小程序服务评价代码修改 2023-10-20 13:35:37 +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
赵旭
a865b49fa4 Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-20 09:42:13 +08:00
张恒
ca5b656ee6 小程序评价代码修改 2023-10-19 17:30:41 +08:00
纪寒
7fcf37c42f 医生App端医生拒接专家咨询订单接口开发 2023-10-19 17:22:10 +08:00
纪寒
d7165b3fba 医生App端医生拒接专家咨询订单接口开发 2023-10-19 16:55:17 +08:00
纪寒
82ec747dc4 医生App端医生拒接专家咨询订单接口开发 2023-10-19 16:52:34 +08:00
haown
2a85d219fd Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-19 13:40:41 +08:00
haown
7b9d49cf1b update===>:修改筛查问题。 2023-10-19 13:39:47 +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
张恒
c5fcb0e0b9 小程序订单查看修改 2023-10-18 15:06:02 +08:00
赵旭
126151457d Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-18 15:03:49 +08:00