 zhangye
|
b0ab830663
|
Merge branch 'master' into hnsdlyy
# Conflicts:
# ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/controller/PmsController.java
# ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml
# ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/PmsPatientDao.xml
|
15 hours ago |
ccsens_zhengzhichuan
|
639d7d6e47
|
Merge branch 'master' of http://116.204.114.73:3000/ccsens_zhengzhichuan/cga_v2
|
17 hours ago |
|
ccsens_zhengzhichuan
|
f4bb2edb46
|
修改就诊
|
17 hours ago |
lzp
|
e2773bb8a9
|
合并后端
|
17 hours ago |
|
lzp
|
b7c821866e
|
pdf引入路径错误
|
17 hours ago |
|
ccsens_zhengzhichuan
|
54242d5f75
|
修改后台就诊列表
|
17 hours ago |
|
lzp
|
a8361a9c23
|
合并修改（套餐选择项层级太高，导致下一步会选择套餐）
|
1 day ago |
|
lzp
|
fa305e762e
|
就诊号不设置数字框
|
2 days ago |
|
ccsens_zhengzhichuan
|
f8caea6e45
|
修改查询患者列表权限
|
3 days ago |
|
ccsens_zhengzhichuan
|
df70a0139b
|
修改查询患者列表权限
|
3 days ago |
|
ccsens_zhengzhichuan
|
afb7d9a8dd
|
修改后台报告
|
3 days ago |
|
zhangye
|
53a3fd5496
|
修改同步
|
3 days ago |
|
zhangye
|
2cc406cb1b
|
Merge branch 'master' into hnsdlyy
|
3 days ago |
|
ccsens_zhengzhichuan
|
8e760c8401
|
修改查询部门权限
|
3 days ago |
|
zhangye
|
fa92977196
|
修改同步
|
3 days ago |
|
zhangye
|
6095354869
|
Merge remote-tracking branch 'origin/master' into hnsdlyy
# Conflicts:
# ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java
|
3 days ago |
|
ccsens_zhengzhichuan
|
017ffd4d88
|
修改后台导出报告单
|
3 days ago |
|
zhangye
|
10169e7cc1
|
修改密码增加验证
|
3 days ago |
|
ccsens_zhengzhichuan
|
b852a45327
|
Merge branch 'master' of http://116.204.114.73:3000/ccsens_zhengzhichuan/cga_v2
|
4 days ago |
|
ccsens_zhengzhichuan
|
94ebc04b7e
|
修改查询套餐接口 女性患者不查询前列腺套餐
|
4 days ago |
|
lzp
|
80104a77bf
|
合并后端
|
4 days ago |
|
lzp
|
f201585417
|
选择量表一级套餐添加全选，查询量表套餐接口传患者id
|
4 days ago |
|
lzp
|
b3a0e64bc7
|
选择量表一级套餐添加全选，查询量表套餐接口传患者id
|
4 days ago |
|
ccsens_zhengzhichuan
|
628de0599d
|
修改统计 修改阳性报告单
|
4 days ago |
|
zhangye
|
d9eab31183
|
修改
|
4 days ago |
|
lzp
|
72e62f108c
|
文化程度添加7：其他
|
4 days ago |
|
zhangye
|
141c363a8c
|
修改患者查询权限
|
4 days ago |
|
zhangye
|
21d4e30333
|
修改查看患者列表
|
4 days ago |
|
zhangye
|
b6a796759e
|
修改配置文件
|
4 days ago |
|
zhangye
|
5028a01766
|
修改性别和婚姻状况的备注
|
4 days ago |
|
zhangye
|
7e20c617f7
|
电力医院对接修改
|
4 days ago |
|
zhangye
|
7f3419c473
|
添加日志，修改定时时间
|
5 days ago |
|
zhangye
|
5884825801
|
修改定时任务
|
5 days ago |
|
zhangye
|
a5b0176cbe
|
修改同步相关代码
|
6 days ago |
|
zhangye
|
f689dbe4e9
|
电力医院修改视图同步和列表权限
|
6 days ago |
|
zhangye
|
a73f431bd5
|
Merge branch 'master' into hnsdlyy
# Conflicts:
# ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/StatisticsServiceImpl.java
# ruisi_java/ruisi-web-admin/src/main/resources/application-prod.yml
# ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml
# ruisi_java/ruisi-web-examine/src/main/resources/application-prod.yml
|
6 days ago |
|
zhangye
|
9bfaba9471
|
Merge branch 'dock'
|
6 days ago |
|
zhangye
|
68eaa841a4
|
修改视图同步
|
6 days ago |
|
zhangye
|
f045a0b7c0
|
修改回调报告单页面
|
6 days ago |
|
zhangye
|
bdaea31f6a
|
修改视图同步
|
6 days ago |
|
ccsens_zhengzhichuan
|
07ca788ad4
|
生产部署
|
6 days ago |
|
ccsens_zhengzhichuan
|
e65fe00fa4
|
修改忽略未完成报告接口，判空
|
6 days ago |
|
zhangye
|
a48c286d50
|
修改回调报告单页面
|
6 days ago |
|
zhangye
|
886760bfe6
|
Merge branch 'master-dev'
# Conflicts:
# web_client/cgaClient0306-2.zip
# web_client/src/views/Patient/chooseSetMeal/index.vue
# web_client/src/views/history/components/scaleInfor.vue
# web_client/src/views/history/components/scaleInforCopy.vue
# web_client/vue.config.js
|
6 days ago |
|
lzp
|
219b210213
|
合并后端
|
6 days ago |
|
ccsens_zhengzhichuan
|
b454f1d086
|
调整报告单
|
6 days ago |
|
ccsens_zhengzhichuan
|
1ac8af8a9f
|
合并master
|
6 days ago |
|
lzp
|
41949ad14b
|
修改量表层级太高，导致点击下一步会选择量表
|
7 days ago |
|
ccsens_zhengzhichuan
|
e7d0bc56d7
|
修改整体报告单
|
7 days ago |
|
ccsens_zhengzhichuan
|
344a385997
|
添加MOCA雷达图， 添加总分趋势
|
7 days ago |
