Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/prescription/PrescriptionService.java

@@ -350,7 +350,6 @@ public class PrescriptionService {
		PrescriptionPay prescriptionPay = prescriptionPayDao.findByPrescriptionPay(code);
		//获取配送信息
		PrescriptionExpressage prescriptionExpressage = prescriptionExpressageDao.findByPrescriptionCode(code);
		
		jo.put("prescriptionInfos", prescriptionInfos);
		jo.put("prescriptionPay", prescriptionPay);
		jo.put("prescriptionExpressage", prescriptionExpressage);
@@ -426,11 +425,12 @@ public class PrescriptionService {
					}
				}
				ja.put(eo);
				jo.put("expresslog",jo);
			}
			jo.put("expresslog",ja.toString());
		}
		
		
		
		return jo;
	}
}

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_order.jsp

@@ -48,7 +48,7 @@
            </div>
            <label class="label_title fd-label">居民电话</label>
            <div class="l-text-wrapper m-form-control">
                <input id="phone" readonly class="fd-input" type="text"   />
                <input id="mobile" readonly class="fd-input" type="text"   />
            </div>
        </div>
        <div class="m-form-group" style="">
@@ -73,19 +73,22 @@
            </div>
            <label class="label_title fd-label">订单号:</label>
            <div class="l-text-wrapper m-form-control">
                <input class="fd-input" type="text" />
                <input id="prescriptionExpresssageCode" class="fd-input" type="text" />
            </div>
        </div>
        <div class="m-form-group" style="border-top: solid 1px #ccc;">
            <label class="label_title fd-label">订单跟踪:</label>
            <div class="l-text-wrapper m-form-control">
                <input class="fd-input" readonly type="text"  value="订单跟踪" />
            </div>
            <label class="label_title fd-label">出药机构:</label>
            <div class="l-text-wrapper m-form-control">
                <input id="prescriptionHospital" readonly class="fd-input" type="text"  />
            </div>
        </div>
        <div style="margin-left:10px;">
            <label class="label_title fd-label">订单跟踪</label>
        </div>
        <div id="prescriptionOrder_div" class="m-form-group" style="border-top: solid 1px #ccc;">
        </div>
    </div>
</div>
</body>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_order_js.jsp

@@ -30,38 +30,47 @@
                                if (result.status == '200') {
                                    var data = result.data;
                                    //配送方式
                                    var dispensaryDispensaryTypeName = data.dispensaryDispensaryTypeNamee;
                                    var dispensaryDispensaryTypeName = data.dispensaryDispensaryTypeName;
                                    $('#dispensaryDispensaryTypeName').val(dispensaryDispensaryTypeName);
                                    if(data.prescriptionExpressage){
                                        //配送地点
                                        var expressaddress = data.prescriptionExpressage.provinceName
                                            +data.prescriptionExpressage.address
                                            +data.prescriptionExpressage.cityName
                                            +data.prescriptionExpressage.townName
                                            +data.prescriptionExpressage.streetName
                                            +data.prescriptionExpressage.address;
                                        $('#expressaddress').val(expressaddress);
                                        //居民姓名
                                        var patientname = data.prescriptionExpressage.name;
                                        $('#patientname').val(patientname);
                                        //居民电话
                                        var phone = data.prescriptionExpressage.phone;
                                        $('#phone').val(phone);
                                        var mobile = data.prescriptionExpressage.mobile;
                                        $('#mobile').val(mobile);
                                        //配送员
                                        var expressageName = data.prescriptionExpressage.expressageName;
                                        $('#expressageName').val(expressageName);
                                        if("3" == data.dispensaryDispensaryType){
                                            var expressageName = data.prescriptionExpressage.expressageName;
                                        //配送机构
                                        var expressageHospitalAddress = data.prescriptionExpressage.expressageHospitalAddress;
                                        $('#expressageHospitalAddress').val(expressageHospitalAddress);
                                            if(expressageName){
                                                //配送员
                                                $('#expressageName').val(expressageName);
                                                $('#expressaddress').val(data.prescriptionExpressage.patientHospitalName);
                                                $('#expressageHospitalAddress').val(data.prescriptionExpressage.patientHospitalAddress);
                                            }else{
                                                //配送员
                                                $('#expressageName').val("待分配");
                                                $('#expressaddress').val(data.prescriptionExpressage.patientHospitalName);
                                                $('#expressageHospitalAddress').val(data.prescriptionExpressage.patientHospitalAddress);
                                            }
                                        }else if("2" == data.dispensaryDispensaryType){
                                            //配送地点
                                            var expressaddress = data.prescriptionExpressage.provinceName
                                                +data.prescriptionExpressage.cityName
                                                +data.prescriptionExpressage.townName
                                                +data.prescriptionExpressage.address;
                                            $('#expressaddress').val(expressaddress);
                                            $('#expressageName').val("快递员配送");
                                            $('#expressageHospitalAddress').val(data.prescriptionHospital);
                                        }
                                        //订单号
                                        var prescriptionCode = data.prescriptionExpressage.prescriptionCode;
                                        $('#prescriptionCode').val(prescriptionCode);
                                        var prescriptionExpresssageCode = data.prescriptionExpressage.code;
                                        $('#prescriptionExpresssageCode').val(prescriptionExpresssageCode);
                                    }
                                    //出药机构
                                    var prescriptionHospital = data.prescriptionHospital;
@@ -71,7 +80,23 @@
                                    var prescriptionStatus = data.prescriptionStatusName;
                                    $('#prescriptionStatus').val(prescriptionStatus);
                                    //订单跟踪
                                    var expresslogjsonStr = data.expresslog;
                                    var expresslog =  eval("(" + expresslogjsonStr + ")");
                                    var expresslogStr = "";
                                    if(expresslog.length >0){
                                        for (var i=0;i<expresslog.length;i++)
                                        {
                                            var str = expresslog[i].statusName;
//                                            if(expresslog[i].drugDeliveryOperatorName){
//                                                str += ",确认人:"+expresslog[i].drugDeliveryOperatorName;
//                                            }
                                            str +=","+expresslog[i].createTime;
                                            expresslogStr += "<a style=\"margin-left:10px;\">"+str+"</a><br>";
                                        }
                                    }
                                    $('#prescriptionOrder_div').html(expresslogStr);
                                }else{
                                    $.Notice.error(result.msg);