xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
217 Commits 1 Branch 0 Tags 2.4 MiB
4e0844558d
Commit Graph

112 Commits

Author SHA1 Message Date
赵旭
7bce05f186 筛查分析 2023-10-30 14:04:06 +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
zhangheng
8000fbc1a1 pc端科室人员代码格式化 2023-10-27 15:35:40 +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
zhangheng
9ba5b7f7ca pc端订单信息修改 2023-10-27 10:29:39 +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
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
赵旭
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
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
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
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
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
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
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
张恒
ca5b656ee6 小程序评价代码修改 2023-10-19 17:30:41 +08:00
haown
7b9d49cf1b update===>:修改筛查问题。 2023-10-19 13:39:47 +08:00
mengkuiliang
1002c6c2fc 1、修改服务评价接口； 
2、添加获取服务评价列表接口；
3、居民信息表添加签约编号字段；
 2023-10-18 17:33:58 +08:00
mengkuiliang
3bb2fd911f Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 2023-10-17 16:34:20 +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
haown
5a25a1c39a update===>:修改小程序医生排班时间表查询。 2023-10-17 16:08:37 +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
纪寒
3b6c9994dd 商城相关功能代码移植 2023-10-16 17:00:31 +08:00
纪寒
8af9f2edf8 商城相关功能代码移植 2023-10-16 15:00:16 +08:00
纪寒
fe9f8865eb Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支 2023-10-16 13:52:19 +08:00
纪寒
c8228e64d2 实体类和Mapper文件添加数据库新增字段 2023-10-16 13:52:10 +08:00
张恒
11432e39d8 删除多余代码 2023-10-16 13:31:45 +08:00
mengkuiliang
9f4e611b0d Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 2023-10-16 09:07:24 +08:00
张恒
c99a392189 小程序个人中心修改 2023-10-13 17:21:32 +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
mengkuiliang
87cd158270 1、添加获取家医人群、根据人群获取服务包、获取签约协议接口； 
2、添加签约申请居民签字上传接口；
3、添加签约周期字段；
 2023-10-12 17:34:47 +08:00
张恒
8cf706fa6e 小程序代码移植 2023-10-12 14:39:10 +08:00