|
@@ -30,7 +30,7 @@ let collapseImg = require('./../images/collapse2.png').replace(/^undefined/g, ''
|
|
|
let go = require('./../images/g1.png').replace(/^undefined/g, '')
|
|
|
let treatDisName, treatUniqueName
|
|
|
let maydiagnoseList = [], hasdiagnoseList = []
|
|
|
-let maydiagnoseType = false, hasdiagnoseType = false;
|
|
|
+let maydiagnoseType = false, hasdiagnoseType = false, rightList = [];
|
|
|
let generalTreatInfo
|
|
|
const { renderFollowUp } = require('./followUp.js');
|
|
|
const { getTcmMr } = require('./tcmiss.js');
|
|
@@ -205,11 +205,16 @@ function renderModuleWrapper(moduleList) {
|
|
|
if (!moduleList) {
|
|
|
return
|
|
|
}
|
|
|
+ console.log(445, 663);
|
|
|
let moduleStr = '', treatStr = ""
|
|
|
for (let i = 0; i < moduleList.length; i++) {
|
|
|
+ if (moduleList[i].code == 'general' || moduleList[i].code == 'medicine' || moduleList[i].code == 'operation') {
|
|
|
+ rightList.push(moduleList[i].status)
|
|
|
+ }
|
|
|
if (moduleList[i].status != '0') {
|
|
|
if (moduleList[i].code == 'general' || moduleList[i].code == 'medicine' || moduleList[i].code == 'operation') {
|
|
|
treatStr += `<div class="moduleItem ${moduleList[i].code}" data-num="${moduleList[i].number}" style="display:none"><span class="moduleItemTitBox"></span></div>`
|
|
|
+ rightList.push(moduleList[i].status)
|
|
|
} else if (moduleList[i].code == 'nurse') {
|
|
|
moduleStr += `<div class="moduleItem ${moduleList[i].code}" data-num="${moduleList[i].number}" style="display:none"><span class="moduleItemTitBox"></span></div>`
|
|
|
} else if (moduleList[i].code == 'critical') {
|
|
@@ -367,10 +372,14 @@ function renderPushData() {
|
|
|
renderDiag(diagPush)
|
|
|
renderDiagList(diagList)
|
|
|
renderAffListList(AffList)
|
|
|
- if (medicinesPush.length > 0 || operationsPush.length > 0 || generaTreatPush) {
|
|
|
+ let onShow = false
|
|
|
+ if (rightList.indexOf(1) >= 0) {
|
|
|
+ onShow = true
|
|
|
+ }
|
|
|
+ if ((medicinesPush.length > 0 || operationsPush.length > 0 || generaTreatPush) && onShow) {
|
|
|
let str = `<img class="treatIcon" src = ${titleConfigH["treat"].icon} /><span>${titleConfigH["treat"].name}</span>`
|
|
|
$(".rightBoxTitle").append(str)
|
|
|
- renderDisName()
|
|
|
+ // renderDisName()
|
|
|
$(".empty-box").hide();
|
|
|
$(".rightWrapper").css("display", "block")
|
|
|
if ($(".leftBox .moduleItem:visible").length === 0) { //左侧没有数据,右侧有数据时,右侧往左移
|