zhouna vor 4 Jahren
Ursprung
Commit
a59eb2f9c1
4 geänderte Dateien mit 56 neuen und 23 gelöschten Zeilen
  1. 15 0
      src/images/d1.svg
  2. 15 22
      src/js/cdss.js
  3. 15 1
      src/js/cdssHorizontal.js
  4. 11 0
      src/js/promise.js

+ 15 - 0
src/images/d1.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="7px" viewBox="0 0 10 7" version="1.1" xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61 (89581) - https://sketch.com -->
+    <title>向下</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="辅检详情对接页" transform="translate(-139.000000, -37.000000)" fill="#2A9BD5" fill-rule="nonzero">
+            <g id="向下" transform="translate(139.000000, 37.000000)">
+                <path d="M0.617841012,0 C0.108021168,0 -0.218083867,0.753229533 0.172524759,1.18540835 L4.56116968,6.04118247 C4.81296271,6.31960584 5.18729092,6.31960584 5.43897029,6.04118247 L9.82781761,1.18552892 C10.2085166,0.76421551 9.91163569,0.000137215503 9.38886126,0.000137215503 L0.617830114,0 L0.617841012,0 Z"
+                      id="路径"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 15 - 22
src/js/cdss.js

@@ -39,13 +39,6 @@ const { transConf } = require('./util.js');
 
 //静态知识类型: 1:诊断 2.药品 3.化验套餐 4.化验明细 5.辅检 6.手术和操作
 
- 
-// console.log('aaaaaaaaaaa')
-// $(".bodyWrap").on("mousewheel DOMMouseScroll",function(e){
-//   // console.log('aaaaaaaaaaa')
-//   e.stopPropagation()
-//   // e.preventDefault();
-// })
 let moduleConfig={
   auxiliary:"recommendWrap",
   qc:"qcWrap",
@@ -65,18 +58,8 @@ let treatDisName;
 function getMRInfo() {
    return post(config.getMr2,{mrId:mrId})
 }
-// $('.loading').css("display","block")
 $('.empty').css("display","none")
 if(mrId){
-  // getMRInfo().then(res =>{
-  //   if(res.data.code == '0'){
-  //       msg = res.data.data ||{}
-  //       window.msg = msg
-      
-  //   }
-  // }).catch(function (err) {
-  //     console.log(err);
-  // })
   Promise.all([getConf(),getMRInfo()]).then(([res1,res2])=>{
     const data = res1.data.data&&res1.data.data[0]
     msg = res2.data.data ||{}
@@ -107,7 +90,7 @@ function getConf() {
 
 function getPushInfo() {
     return post(config.pushInner, Object.assign({}, msg, {
-        featureType: '1,4,5,6,7,8,9,10,12',
+        featureType: '1,4,5,6,7,8,9,10,12,13',
         hospitalId: hospitalIdUrl || msg.hospitalId,
         ruleType: config.ruleTypeMap['22']
     }))
@@ -263,6 +246,7 @@ function renderPushData(){
       let medicinesPush = result.medicines || []
       let operationsPush = result.operations ||[]
       let treatPush = result.treat&&result.treat[0] ||{}
+        let nursePush = result.nurse || []
       treatDisName = treatPush&&treatPush["name"]
       let generaTreatPush = treatPush&&treatPush["generaTreat"]
       // let lisPush =[{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
@@ -275,6 +259,7 @@ function renderPushData(){
       let symptomNum = $(".moduleItem.symptom").attr("data-num") || 5
       let medicinesNum = $(".moduleItem.medicine").attr("data-num") || 5
       let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
+        let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
      
 
       renderLis(lisPush,lisNum,3,true)
@@ -286,6 +271,7 @@ function renderPushData(){
       renderMedicinesPush(medicinesPush,medicinesNum,2,true)
       renderOperationPush(operationsPush,operationsNum,6,true)
       rendergeneraTreatPush(generaTreatPush)
+        renderNurse(nursePush, nurseNum, 9, true)
       if(hasCompleteTnterface === allInterface){
         $('.loading').css("display","none")
         if(moduleNum === 0){
@@ -496,9 +482,17 @@ function renderScale(list,showNum,type,hasInfo){
     $('.moduleItem.evaluation').append(shortStr).append(longStr)
     $('.moduleItem.evaluation').css("display","block")
   }
- 
 }
 
+function renderNurse(list, showNum, type, hasInfo) {
+    if (list.length > 0 && $(".moduleItem.nurse").length > 0) {
+        moduleNum++
+        $('.moduleItem.nurse').append(titleStr("nursePush"))
+        let {shortStr, longStr} = renderItemWrapper(list, showNum, type, hasInfo)
+        $('.moduleItem.nurse').append(shortStr).append(longStr);
+        $('.moduleItem.nurse').css("display", "block")
+    }
+}
 function renderPacs(list,showNum,type,hasInfo){
   if(list.length > 0 &&  $(".moduleItem.pacs").length > 0){
     moduleNum++
@@ -568,9 +562,8 @@ function renderOperationPush(list,showNum,type,hasInfo){
 }
 
 
-
-
-function renderItemWrapper(list,showNum,type,hasInfo){
+function renderItemWrapper(list, showNum, type, hasInfo) {
+    console.log(33, type)
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
 

+ 15 - 1
src/js/cdssHorizontal.js

@@ -54,7 +54,7 @@ function getConf() {
 }
 function getPushInfo() {
     return post(config.pushInner, Object.assign({}, msg, {
-        featureType: '1,4,5,6,7,8,9,10,12',
+        featureType: '1,4,5,6,7,8,9,10,12,13',
         hospitalId: hospitalIdUrl || msg.hospitalId,
         ruleType: config.ruleTypeMap['22']
     }))
@@ -259,6 +259,7 @@ function renderPushData(){
       let checkupPush = result.vital ||[]
       let medicinesPush = result.medicines || []
       let operationsPush = result.operations ||[]
+        let nursePush = result.nurse || []
       let treatPush = result.treat&&result.treat[0] ||{}
       treatDisName = treatPush&&treatPush["name"]
       treatUniqueName = treatPush&&treatPush["uniqueName"]
@@ -274,6 +275,7 @@ function renderPushData(){
       let symptomNum = $(".moduleItem.symptom").attr("data-num") || 5
       let medicinesNum = $(".moduleItem.medicine").attr("data-num") || 5
       let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
+        let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
 
       renderLis(lisPush,lisNum,3,true)
       renderScale(scalePush,scaleNum,8,true)
@@ -281,6 +283,7 @@ function renderPushData(){
       renderCheckup(checkupPush,checkupNum,null,true)
       renderSymptomPush(symptomPush,symptomNum,null,true)
       renderDiag(diagPush)
+        renderNurse(nursePush, nurseNum, 9, true)
 
       if(medicinesPush.length > 0 || operationsPush.length > 0||generaTreatPush){
         let str = `<img class="treatIcon" src = ${titleConfigH["treat"].icon} /><span>${titleConfigH["treat"].name}</span>`
@@ -338,6 +341,17 @@ function renderScale(list,showNum,type,hasInfo){
     $('.moduleItem.evaluation').css("display","block")
   }
 }
+
+function renderNurse(list, showNum, type, hasInfo) {
+    if (list.length > 0 && $(".moduleItem.nurse").length > 0) {
+        moduleNum++
+        $('.moduleItem.nurse .moduleItemTitBox').append(titleStr("nursePush"))
+        let {shortStr, longStr} = renderItemWrapper(list, showNum, type, hasInfo)
+        $('.moduleItem.nurse').append(shortStr)
+        $('.moduleItem.nurse').append(renderLongStr(titleConfigH["nursePush"].name, longStr, titleConfigH["nursePush"].location))
+        $('.moduleItem.nurse').css("display", "block")
+    }
+}
 function renderPacs(list,showNum,type,hasInfo){
   if(list.length > 0 &&  $(".moduleItem.pacs").length > 0){
     moduleNum++

+ 11 - 0
src/js/promise.js

@@ -208,6 +208,11 @@ const titleConfig = {
     icon: iconDrugPush,
     name:"推荐用药"
   },
+    nursePush: {
+        background: "#EEF5FD",
+        icon: iconTreat,
+        name: "推荐护理"
+    },
   operationPush:{
     background: "#E3FEFE",
     icon: iconOperationPush,
@@ -285,6 +290,12 @@ const titleConfigH = {
     name:"手术/操作",
     location:"right"
   },
+    nursePush: {
+        background: "#EEF5FD",
+        icon: iconTreatMedicine,
+        name: "推荐护理",
+        location: "right"
+    },
   vigilancePush:{
     background: "#FFE8DD",
     icon: iconWarning,