Skip to content

A
Aidea
Commit 9ac22c9d authored by 黎聪聪's avatar 黎聪聪
Browse files
Options

2020年11月11日 09:58:04

parent d6cbe6a0
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 90 deletions
aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html
View file @ 9ac22c9d
......@@ -47,6 +47,21 @@
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<link rel="stylesheet" href="plugins/bootstrap-switch/bootstrap-switch.min.css">
<style>
.switch {
width: 35%;
display: inline-block;
}
.delAccounts {
display: inline-block;
}
.bootstrap-switch-container{display: -webkit-box;
white-space: nowrap;}
</style>
</head>
<!-- END HEAD -->
<body class="hold-transition skin-blue sidebar-mini">
......@@ -189,46 +204,42 @@
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>审核未通过原因<font style="color: red"></font></label>
<div
class="form-control" name="description"
id="description"
maxlength="50"
style="height: 68px;background: #EEEEEE"
>$!{data.description}
<label>有无过敏反应<font style="color: red"></font></label>
<br/>
<div class="switch">
<input id="allergy" name="allergy" type="checkbox" checked readonly="readonly" />
</div>
<!-- <div-->
<!-- class="form-control" name="allergy"-->
<!-- id="allergy"-->
<!-- maxlength="50"-->
<!-- style="height: 68px;background: #EEEEEE"-->
<!-- >$!{data.allergy}-->
<!-- </div>-->
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>疾病史<font style="color: red"></font></label>
<div
class="form-control" name="pastRecords"
id="pastRecords"
maxlength="50"
style="height: 68px;background: #EEEEEE"
>$!{data.pastRecords}
<label>有无不良反应<font style="color: red"></font></label>
<br/>
<div class="switch">
<input id="pastRecords" name="pastRecords" checked type="checkbox" readonly="readonly" />
</div>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>过敏史<font style="color: red"></font></label>
<div
class="form-control" name="allergy"
id="allergy"
maxlength="50"
style="height: 68px;background: #EEEEEE"
>$!{data.allergy}
<label>是否服用过该药且无禁忌症<font style="color: red"></font></label>
<br/>
<div class="switch">
<input id="illness" name="illness" checked type="checkbox" readonly="readonly" />
</div>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>病情描述<font style="color: red"></font></label>
<label>审核未通过原因<font style="color: red"></font></label>
<div
class="form-control" name="illness"
id="illness"
class="form-control" name="description"
id="description"
maxlength="50"
style="height: 68px;background: #EEEEEE"
>$!{data.illness}
>$!{data.description}
</div>
</div>
......@@ -262,7 +273,7 @@
#end
<a id="reject" class="btn btn-danger" data-toggle="modal" data-target="#exampleModal">拒绝</a>
<a href="#springUrl('/a/consultSheet/list')" class="btn btn-default">返回</a>
<a href="#springUrl('/a/consultSheet/list')" class="btn btn-default" >返回 </a>
</div>
</div>
</form>
......@@ -304,6 +315,7 @@
<script src="plugins/security/sha256.js" type="text/javascript"></script>
<script src="plugins/jquery-validation/js/jquery.validate.min.js"></script>
<script src="js/jquery.form.min.js"></script>
<script src="https://cdn.bootcss.com/bootstrap-switch/4.0.0-alpha.1/js/bootstrap-switch.min.js"></script>
<script type="text/javascript" charset="utf-8" src="plugins/ueditor-min-1.4.3/ueditor.config.js"></script>
<script type="text/javascript" charset="utf-8" src="plugins/ueditor-min-1.4.3/ueditor.all.js"></script>
<script type="text/javascript" charset="utf-8" src="plugins/ueditor-min-1.4.3/lang/zh-cn/zh-cn.js"></script>
......@@ -313,11 +325,62 @@
var consultid;
var bindSwitch = function () {
var allergy = "$!{data.allergy}";
var pastRecords = "$!{data.pastRecords}";
var illness = "$!{data.illness}";
if (allergy==0){
$('#allergy').bootstrapSwitch({
onText: '是',
offText: '否',
offColor:'danger',
state: false
});
}else{
$('#allergy').bootstrapSwitch({
onText: '是',
offText: '否',
offColor:'danger',
state: true
});
}
if (pastRecords==0){
$('#pastRecords').bootstrapSwitch({
onText: '是',
offText: '否',
offColor:'danger',
state: false
});
}else{
$('#pastRecords').bootstrapSwitch({
onText: '是',
offText: '否',
offColor:'danger',
state: true
});
}
if (illness==0){
$('#illness').bootstrapSwitch({
onText: '是',
offText: '否',
offColor:'danger',
state: false
});
}else{
$('#illness').bootstrapSwitch({
onText: '是',
offText: '否',
offColor:'danger',
state: true
});
}
};
// href="#springUrl('/a/consultSheet/list')"
$().ready(function () {
consultid = $("#consultId").val();
var value = $("#sex").val();
if (value == 0) {
$("#sex").val("女");
......@@ -337,7 +400,16 @@
$("#save").hide();
}
bindSwitch();
// if (allergy==0){
// $('#allergy').bootstrapSwitch('state',false);
// }
// if (pastRecords==0){
// $('#pastRecords').bootstrapSwitch('state',false);
// }
// if (illness==0){
// $('#illness').bootstrapSwitch('state',false);
// }
Cfapp.init();
recdTypeAdd.init();
});
......
aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetlist.html
View file @ 9ac22c9d
......@@ -82,10 +82,10 @@
<input type="text" class="form-control "
name="userName" placeholder="用药人姓名">
</div>
<div class="col-xs-2">
<input type="text" class="form-control "
name="illness" placeholder="病情描述">
</div>
<!-- <div class="col-xs-2">-->
<!-- <input type="text" class="form-control "-->
<!-- name="illness" placeholder="病情描述">-->
<!-- </div>-->
<a href="javascript:void(0)" class="btn btn-primary search">搜索</a>
#if($shiro.hasPermission("qy:consultSheet:edit"))
......@@ -104,10 +104,9 @@
<th>用药人姓名</th>
<th>性别</th>
<th>联系电话</th>
<th>疾病史</th>
<th>处方单图片</th>
<th>病情描述</th>
<th>过敏史</th>
<th>有无不良反应</th>
<th>是否服用过该药且无禁忌症</th>
<th>有无过敏反应</th>
<th>药师姓名</th>
<th>客服姓名</th>
<th>审核状态</th>
......@@ -226,9 +225,6 @@
{
"mData": "pastRecords"
},
{
"mData": "prescription"
},
{
"mData": "illness"
},
......@@ -310,46 +306,37 @@
"aTargets": [5],
"mData": "pastRecords",
"mRender": function (a, b, c, d) {
if(a){
return a;
if(a==0){
return "否";
}else{
return null;
return "是";
}
}
},
{
"aTargets": [6],
"mData": "prescription",
"mRender": function (a, b, c, d) {
var html =""
html+='<img style="width: 50px;height: auto" src="'+a+'"">'
return html;
}
},
{
"aTargets": [7],
"mData": "illness",
"mRender": function (a, b, c, d) {
if(a){
return a;
if(a==0){
return "否";
}else{
return null;
return "是";
}
}
},
{
"aTargets": [8],
"aTargets": [7],
"mData": "allergy",
"mRender": function (a, b, c, d) {
if(a){
return a;
if(a==0){
return "否";
}else{
return null;
return "是";
}
}
},
{
"aTargets": [9],
"aTargets": [8],
"mData": "pharmaName",
"mRender": function (a, b, c, d) {
if(a){
......@@ -360,7 +347,7 @@
}
},
{
"aTargets": [10],
"aTargets": [9],
"mData": "customerName",
"mRender": function (a, b, c, d) {
if(a){
......@@ -371,7 +358,7 @@
}
},
{
"aTargets": [11],
"aTargets": [10],
"mData": "status",
"mRender": function (a, b, c, d) {
if (a==0){
......@@ -384,7 +371,7 @@
}
},
{
"aTargets": [12],
"aTargets": [11],
"mData": "description",
"mRender": function (a, b, c, d) {
if(a){
......@@ -395,7 +382,7 @@
}
},
{
"aTargets": [13],
"aTargets": [12],
"mData": "id",
"mRender": function (a, b, c, d) {
var object = c.status;
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheet.java
View file @ 9ac22c9d
......@@ -36,15 +36,15 @@ public class ConsultSheet extends UserSheet implements Serializable {
/* 手机号 */
@ExportConfig(value = "联系电话", width = 100, showLevel = 1)
private String phone;
/* 疾病史 */
@ExportConfig(value = "疾病史", width = 100, showLevel = 1)
private String pastRecords;
/* 过敏史 */
@ExportConfig(value = "过敏史", width = 100, showLevel = 1)
private String allergy;
/* 病情描述 */
@ExportConfig(value = "病情描述", width = 100, showLevel = 1)
private String illness;
/* 有无不良反应 */
@ExportConfig(value = "有无不良反应", width = 100, showLevel = 1)
private Long pastRecords;
/* 有无过敏反应 */
@ExportConfig(value = "有无过敏反应", width = 100, showLevel = 1)
private Long allergy;
/* 是否服用过该药且无禁忌症 */
@ExportConfig(value = "是否服用过该药且无禁忌症", width = 100, showLevel = 1)
private Long illness;
/* 处方单 */
@ExportConfig(value = "处方单", width = 100, showLevel = 1)
private String prescription;
......@@ -52,7 +52,7 @@ public class ConsultSheet extends UserSheet implements Serializable {
private Long doctorId;
/* 客服id */
private Long serviceId;
/* 本次确认症状 */
/* 线下已确证疾病 */
private String symptom;
/*是否已在医院确诊*/
private Long diagnosis;
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheetVO.java
View file @ 9ac22c9d
......@@ -30,15 +30,15 @@ public class ConsultSheetVO {
private String phone;
/* 疾病史 */
@ExportConfig(value = "疾病史", width = 100, showLevel = 1)
@ExportConfig(value = "有无不良反应", width = 100, showLevel = 1)
private String pastRecords;
/* 病情描述 */
@ExportConfig(value = "病情描述", width = 100, showLevel = 1)
@ExportConfig(value = "是否服用过该药且无禁忌症", width = 100, showLevel = 1)
private String illness;
/* 过敏史 */
@ExportConfig(value = "过敏史", width = 100, showLevel = 1)
@ExportConfig(value = "有无过敏反应", width = 100, showLevel = 1)
private String allergy;
/* 状态 */
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java
View file @ 9ac22c9d
......@@ -257,9 +257,9 @@ public class ConsultSheetController {
if (!StringUtils.isEmpty(consultSheet.getUserName())){
conds.like("a.user_name",consultSheet.getUserName());
}
if (!StringUtils.isEmpty(consultSheet.getIllness())){
conds.like("a.illness",consultSheet.getIllness());
}
// if (!StringUtils.isEmpty(consultSheet.getIllness())){
// conds.like("a.illness",consultSheet.getIllness());
// }
conds.equal("a.del_flag", Constants.DEL_FLAG_0);
conds.equal("a.accounts_id", accountsId);
......@@ -306,9 +306,9 @@ public class ConsultSheetController {
consultSheetVO.setUserName(consultSheet.getUserName());
consultSheetVO.setSex(consultSheet.getSex() == 1 ? "男" : "女");
consultSheetVO.setPhone(consultSheet.getPhone());
consultSheetVO.setPastRecords(consultSheet.getPastRecords());
consultSheetVO.setIllness(consultSheet.getIllness());
consultSheetVO.setAllergy(consultSheet.getAllergy());
consultSheetVO.setPastRecords(consultSheet.getPastRecords().equals("0") ? "否" : "是");
consultSheetVO.setIllness(consultSheet.getIllness().equals("0") ? "否" : "是");
consultSheetVO.setAllergy(consultSheet.getAllergy().equals("0") ? "否" : "是");
consultSheetVO.setStatus(consultSheet.getStatus().equals("0") ? "未审核" : consultSheet.getStatus().equals("1") ? "已通过" : "已拒绝");
consultSheetVO.setPharmaName(consultSheet.getPharmaName());
consultSheetVO.setCustomerName(consultSheet.getCustomerName());
......
aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml
View file @ 9ac22c9d
......@@ -152,6 +152,7 @@
<sql id="Column">
order_id,
order_code,
drugs_id,
drugs_num,
openid,
......@@ -421,6 +422,7 @@
values
(
#{orderId},
#{orderCode},
#{drugsId},
#{drugsNum},
#{openid},
......
aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java
View file @ 9ac22c9d
......@@ -110,6 +110,7 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
ProductDto productDtos = orderMapper.fetchProduct(params);
orderDetailDto = new OrderDetailDto();
Order orders = orderMapper.fetchOrder(id);
String number = orders.getNumber();
orderDetailDto.setOrderCode(orders.getNumber());
orderDetailDto.setOrderId(id);
orderDetailDto.setDrugsId(productDtos.getId());
......
cms-modules/cms-core-module-web/src/main/webapp/WEB-INF/views/cfarticle/cfarticlelist.html
View file @ 9ac22c9d
......@@ -813,8 +813,6 @@
} else {
return '<a href="#springUrl("/a/cfarticle/picform?id=' + c.id + '")" data-id="' + c.id + '" data-action="view">' + a + '</a>';
}
}
}, {
"aTargets": [3],
......@@ -903,7 +901,6 @@
} else {
f(e)
}
}
function onArticle(e) {
......@@ -1006,7 +1003,6 @@
btncanceltext: "取消",
success: function () {
select(e)
$('#myModal').modal('show')
},
cancel: function () {
......@@ -1046,7 +1042,7 @@
btntext: "确定",
success: function () {
select(e)
$('#myModal').modal('show')
},
cancel: function () {
location.href = "#springUrl('/a/cfarticle/list')";
......
cms-modules/cms-core-module/src/main/java/com/cftech/cms/cfarticle/web/CfarticleController.java
View file @ 9ac22c9d
......@@ -245,7 +245,7 @@ public class CfarticleController {
if (!StringUtils.isEmpty(cfarticle.getType())) {
conds.equal("t.type", cfarticle.getType());
}if (!StringUtils.isEmpty(startTime)) {
conds.equal("t.update_time", startTime);
conds.equal("DATE_FORMAT(t.create_time,'%Y-%m-%d')", startTime);
}
Sort sort = new Sort("t.create_time", OrderType.DESC);
......
sys-module-web/src/main/webapp/WEB-INF/views/manageuser/userupdate.html
View file @ 9ac22c9d
......@@ -318,7 +318,9 @@
// '<button type="button" class="btn btn-danger delAccounts">删除</button>' +
'</td></tr>';
$("#table tbody").append(html);
bindSwitch();
$(".select2").select2();
} else {
for (var i = 0; i < userRoles.length; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment