|
|
@@ -160,11 +160,11 @@ $(function () {
|
|
|
errorMesageSimaple("主诉不能为空！");
|
|
|
return;
|
|
|
}
|
|
|
- var emrHpi = $("#emrHpi").val();
|
|
|
- if (emrHpi == null || emrHpi == "") {
|
|
|
- errorMesageSimaple("现病史不能为空！");
|
|
|
- return;
|
|
|
- }
|
|
|
+ //var emrHpi = $("#emrHpi").val();
|
|
|
+ // if (emrHpi == null || emrHpi == "") {
|
|
|
+ // errorMesageSimaple("现病史不能为空！");
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
var diagnoseValue = $("#diagnoseValue").val();
|
|
|
var tentativeDiagnosis = $("#tentativeDiagnosis").val();
|
|
|
if (diagnoseValue != null) {
|
|
|
@@ -2485,11 +2485,17 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
|
|
|
errorMesageSimaple("总量为空！");
|
|
|
return;
|
|
|
}
|
|
|
+ var manufactoryName=$("#manufactoryName").val();
|
|
|
var html = '<div class="form-group">';
|
|
|
html += groupId + '.<span style="margin-left: 5px"></span>';
|
|
|
- html += westernMedicineNamme + ' ';
|
|
|
- html += drugWinDb + drugWinUnit + ' 共';
|
|
|
- //html += drugWin + drugWinUnit + ' 共';
|
|
|
+ html += westernMedicineNamme;
|
|
|
+ if(manufactoryName!=null && manufactoryName!='null' && manufactoryName!=""){
|
|
|
+ html+="("+manufactoryName+")"
|
|
|
+ }
|
|
|
+ html+=' ';
|
|
|
+ html+=$("#specification").val();
|
|
|
+ html+=' X ';
|
|
|
+ //html += drugWinDb + drugWinUnit + ' 共';
|
|
|
html += gross + packUnit + " " + '<br/><span style="margin-left: 15px"></span>';
|
|
|
html += '用法：' + supplyTypeText + ' ';
|
|
|
html += drugWin + drugWinUnit + ' ';
|
|
|
@@ -3181,6 +3187,8 @@ function clearWesternMedicine(flag) {
|
|
|
$("#tryFlag").parent().removeClass('checked');
|
|
|
$("#tryFlag").parent().parent().parent().removeClass("in").addClass("hide");
|
|
|
//$("#gross").attr("readonly", "readonly");
|
|
|
+ $("#manufactoryName").val(null);
|
|
|
+ $("#specification").val(null);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -5291,6 +5299,8 @@ function fitWesternMedicine(res, groupNo) {
|
|
|
$("#tryFlag").parent().removeClass("checked");
|
|
|
$("#tryFlag").parent().parent().parent().removeClass("in").addClass("hide");
|
|
|
}
|
|
|
+ $("#manufactoryName").val(res.data.manufactoryName);
|
|
|
+ $("#specification").val(res.data.specification);
|
|
|
// if (groupNo == "91") {
|
|
|
// //医材
|
|
|
// $("#gross").removeAttr("readonly")
|
|
|
@@ -6743,6 +6753,7 @@ function setTableHtml(prescriptionDetail) {
|
|
|
html += prescriptionDetail[j].substring(prescriptionDetail[j].indexOf("用法"));
|
|
|
html += "</td></tr>";
|
|
|
}
|
|
|
+ html+="<tr><td> ------(以下空白)------</td></tr>";
|
|
|
return {html: html, j: j};
|
|
|
}
|
|
|
|
|
|
@@ -7225,6 +7236,10 @@ function printYjReq(patientId, times, type, printType) {
|
|
|
$("#jyReqTz").text(tz);
|
|
|
$("#jyReqReqDept").text(res.data.deptName);
|
|
|
$("#jyReqReqDoctor").text(res.data.doctorName);
|
|
|
+ //检验报告列表名
|
|
|
+ var jyTitle ='<tr><th style="min-height: 30px;border-bottom: 1px solid black;">检验项目</th><th style="min-height: 30px;border-bottom: 1px solid black;">标本</th><th style="min-height: 30px;border-bottom: 1px solid black;">单号</th></tr>';
|
|
|
+ var jyContent="";
|
|
|
+ var needNewPageA=false;
|
|
|
for (var i = 0; i < res.data.mzYjReqList.length; i++) {
|
|
|
var obj = res.data.mzYjReqList[i];
|
|
|
if (i == 0) {
|
|
|
@@ -7232,22 +7247,29 @@ function printYjReq(patientId, times, type, printType) {
|
|
|
$("#jcReqReqDate").text(dateStr);
|
|
|
$("#jyReqReqDate").text(dateStr);
|
|
|
}
|
|
|
- if (i > 0) {
|
|
|
- LODOP.NewPageA();
|
|
|
- }
|
|
|
if (obj.reqType == "3") {
|
|
|
+ if (i > 0) {
|
|
|
+ LODOP.NewPageA();
|
|
|
+ }
|
|
|
$("#reqNoJcReq").text(obj.reqNo);
|
|
|
$("#jcReqItem").text(obj.groupName);
|
|
|
$("#jcReqRemark").text(obj.jyRemark);
|
|
|
LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("jc_card_table").innerHTML);
|
|
|
+ needNewPageA=true;
|
|
|
} else if (obj.reqType == "2") {
|
|
|
- $("#reqNoJyReq").text(obj.reqNo);
|
|
|
- $("#jyReqItem").text(obj.groupName);
|
|
|
- $("#jyReqInspectStuff").text(obj.inspectStuff);
|
|
|
- //检验
|
|
|
- LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("jy_card_table").innerHTML);
|
|
|
+ var inspectStuff=(obj.inspectStuff==null || obj.inspectStuff=="null")?"":obj.inspectStuff;
|
|
|
+ jyContent+='<tr><td style="min-height: 30px;">'+obj.groupName+'</td><td>'+inspectStuff+'</td><td>'+obj.reqNo+'</td></tr>';
|
|
|
}
|
|
|
}
|
|
|
+ if(jyContent!=null && jyContent!="" && jyContent.length>0){
|
|
|
+ if(needNewPageA){
|
|
|
+ LODOP.NewPageA();
|
|
|
+ }
|
|
|
+ jyContent=jyTitle+jyContent;
|
|
|
+ $("#jyContent").html(jyContent);
|
|
|
+ //检验
|
|
|
+ LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("jy_card_table").innerHTML);
|
|
|
+ }
|
|
|
if (printType == 1) {
|
|
|
LODOP.PREVIEW();
|
|
|
} else if (printType == 2) {
|
hurugang