Merge branch 'CommonTemplate' into innterfaceUpdate

src/components/PreInIcss/RotateImg/index.jsx

@@ -36,7 +36,7 @@ class RotateImg extends Component {
     const { idx,imgLis,windowHeight } = this.props;
     let currentImg = imgLis[idx];
     let scaleHeight = windowHeight*0.8;
-    let width = currentImg.width,height = currentImg.height;
+    let width = currentImg.width,height = currentImg.height,overLen;
     if(width>height){
       if(width > scaleHeight){
         height=scaleHeight/width*height
@@ -48,6 +48,7 @@ class RotateImg extends Component {
         height = scaleHeight
       }
     }
+    localStorage.setItem("changeImg",true)
     this.setState({
       current:idx,
       length:imgLis.length,
@@ -55,6 +56,10 @@ class RotateImg extends Component {
       imgHeight:height,
       mgLeft:-width/2,
       mgTop:-height/2
+    },()=>{
+      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left
+      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top
+      localStorage.setItem("changeImg",width>height?overLenT:overLenL)
     })
   }
   handleNext(){
@@ -62,7 +67,7 @@ class RotateImg extends Component {
     const { imgLis,isMove,windowHeight } = this.props;
     let scaleHeight = windowHeight*0.8;
     let tmpIdx = this.state.current;
-    let tmpLen = this.state.length,width,height;
+    let tmpLen = this.state.length,width,height,overLen;
     if(tmpIdx == tmpLen-1){
       width = imgLis[0].width
       height = imgLis[0].height
@@ -93,6 +98,10 @@ class RotateImg extends Component {
       mgLeft:-width/2,
       mgTop:-height/2,
       de:0
+    },()=>{
+      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left
+      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top
+      localStorage.setItem("changeImg",width>height?overLenT:overLenL)
     })
   }
   handlePrev(){
@@ -130,6 +139,10 @@ class RotateImg extends Component {
       mgLeft:-width/2,
       mgTop:-height/2,
       de:0
+    },()=>{
+      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left
+      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top
+      localStorage.setItem("changeImg",width>height?overLenT:overLenL)
     })
     this.props.setMove(false)
   }
@@ -142,6 +155,8 @@ class RotateImg extends Component {
       })
       return;
     }
+    localStorage.setItem("changeImg",true)
+
     this.setState({
       imgWidth:1.2*imgWidth,
       imgHeight:1.2*imgHeight,
@@ -158,6 +173,8 @@ class RotateImg extends Component {
       })
       return;
     }
+    localStorage.setItem("changeImg",true)
+
     this.setState({
       imgWidth:imgWidth*0.8,
       imgHeight:imgHeight*0.8,

src/store/async-actions/mainSuit.js

@@ -44,18 +44,8 @@ export async function getCommSymptomPush(){//获取大数据推送症状
       const type = 1;
       const emrData = getEMRParams();
       const params = {
-        "age": emrData.age,
-        "hosCode": emrData.hosCode,
         "featureType": type,//类型1：症状，4：查体，5：化验，6：辅检，7：诊断
-        "diag": emrData.dis,
-        "lis": emrData.lis,
-        "other": emrData.other,
-        "pasts": emrData.other,
-        "pacs": emrData.pacs,
-        "sex": emrData.sex,
-        "vital":emrData.vital,
-        "symptom": emrData.current + emrData.main
       };
-    const bigData = json(api.symptomPush,params);
+    const bigData = json(api.symptomPush,Object.assign({},params,emrData));
     return bigData;
 }

src/store/reducers/assistCheck.js

@@ -12,6 +12,7 @@ const initSearchList = {
   list: [], //点击的结果
   assistLabel: [], //搜索的结果
   dataString: '', //结果拼接
+  dataArr: '', //结果拼接
   assistVal: '',
 
   hospitalPac: [], //医院检索到的
@@ -43,6 +44,7 @@ export default (state = initSearchList, action) => {
     }
     newState.assistLabel = [...tempArr]
     newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
+    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
     return newState;
   }
   if (action.type == GET_ASSIST_SEARCH_LIST) { //右侧推送添加到左侧
@@ -50,6 +52,7 @@ export default (state = initSearchList, action) => {
     newState.list = action.list
     newState.assistVal = action.val
     newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
+    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
     return newState;
   }
   if (action.type == GET_ASSIST_LABEL) { //默认
@@ -70,6 +73,7 @@ export default (state = initSearchList, action) => {
         newState.assistLabel = [...tempArrs];
       }
     }
+    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
     newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
     return newState;
   }
@@ -87,6 +91,7 @@ export default (state = initSearchList, action) => {
       }
       newState.assistLabel = [...tempArrs]
     }
+    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
     newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
     return newState;
   }
@@ -99,6 +104,7 @@ export default (state = initSearchList, action) => {
         newState.assistLabel = [...tempArr]
       }
     }
+    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
     newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
     return newState;
   }
@@ -111,6 +117,7 @@ export default (state = initSearchList, action) => {
         newState.assistLabel = [...tempArr]
       }
     }
+    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
     newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
     return newState;
   }

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
-const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚

src/utils/drag.js

@@ -177,7 +177,6 @@ let imgXS = 0,//鼠标距离图片左侧的位置
     drgLeft= 0,
     tmpValL=0,
     tmpNum=0,
-    tmpName='',
     tmpValR=0,
     imgDrag = false;
 function imgDragMove(type){
@@ -200,21 +199,20 @@ function imgDragMove(type){
       imgWXS = wrap.offset().left;
       imgWYS = wrap.offset().top;
 
-      if(tmpName){
-        if(drag.attr("src") != tmpName||drag.attr("data-deg")==0){
-          tmpNum==0
-        }
-      }else{
-        tmpName = drag.attr("src")
+      if(localStorage.getItem('changeImg')){
+        tmpNum == 0
+        // localStorage.setItem("changeImg",false)
+        
       }
       
-      if(tmpNum == 0){
-        tmpValL = imgDXS-imgWXS;
-        tmpValR = imgDYS-imgWYS;
-        tmpName = 
-        ++tmpNum
-      }
+      // if(tmpNum == 0){
+      //   tmpValL = imgDXS-imgWXS;
+      //   tmpValR = imgDYS-imgWYS;
+      //   ++tmpNum
+      // }
+
       console.log(imgDXS,imgWXS,tmpNum,'hahaha')
+
       $(document).on('mousemove',handleMoveImg)
       $(document).on('mouseup',handleUpImg)
     })
@@ -235,44 +233,44 @@ function handleMoveImg(event){
   let wrapHeight = drag[0].offsetHeight;
   if(imgDrag){
       
-    console.log('鼠标左：'+page.boxLeft)
-    console.log('鼠标图左：'+imgXS)
-    console.log('容器左：'+imgWXS)
-    console.log('被拖图左：'+drag.offset().left)
-    console.log('bian1：'+tmpValL)
-    console.log('bian2：'+tmpValR)
+    // console.log('鼠标左：'+page.boxLeft)
+    // console.log('鼠标图左：'+imgXS)
+    // console.log('容器左：'+imgWXS)
+    // console.log('被拖图左：'+drag.offset().left)
+    // console.log('bian1：'+tmpValL)
+    // console.log('bian2：'+tmpValR)
 
     imgDXS = page.boxLeft - imgXS - imgWXS;//相对于父元素定位
     imgDYS = page.boxTop - imgYS - imgWYS;
 
-    // if(wrapHeight > wrapWidth){
-    //   drag.css({
-    //     width:wrapWidth+'px',
-    //     height:wrapHeight+'px',
-    //     marginLeft:'0px',
-    //     marginTop:'0px',
-    //     left:imgDXS+(de?163:0) + 'px',
-    //     top:imgDYS-(de?163:0) + 'px'
-    //   })
-    // }
-    // else{
-    //   drag.css({
-    //     width:wrapWidth+'px',
-    //     height:wrapHeight+'px',
-    //     marginLeft:'0px',
-    //     marginTop:'0px',
-    //     left:imgDXS-(de?163:0) + 'px',
-    //     top:imgDYS+(de?163:0) + 'px'
-    //   })
-    // }
-    drag.css({
-      width:wrapWidth+'px',
-      height:wrapHeight+'px',
-      marginLeft:'0px',
-      marginTop:'0px',
-      left:imgDXS-(de?tmpValL:0) + 'px',
-      top:imgDYS+(de?tmpValL:0) + 'px'
-    })
+    if(wrapHeight > wrapWidth){
+      drag.css({
+        width:wrapWidth+'px',
+        height:wrapHeight+'px',
+        marginLeft:'0px',
+        marginTop:'0px',
+        left:imgDXS+(de?tmpValL:0) + 'px',
+        top:imgDYS-(de?tmpValL:0) + 'px'
+      })
+    }
+    else{
+      drag.css({
+        width:wrapWidth+'px',
+        height:wrapHeight+'px',
+        marginLeft:'0px',
+        marginTop:'0px',
+        left:imgDXS-(de?tmpValR:0) + 'px',
+        top:imgDYS+(de?tmpValR:0) + 'px'
+      })
+    }
+    // drag.css({
+    //   width:wrapWidth+'px',
+    //   height:wrapHeight+'px',
+    //   marginLeft:'0px',
+    //   marginTop:'0px',
+    //   left:imgDXS-(de?tmpValR:0) + 'px',
+    //   top:imgDYS+(de?tmpValR:0) + 'px'
+    // })
   }
 }
 module.exports = {

src/utils/tools.js

@@ -656,25 +656,72 @@ function handleEnter(event){
     if(event.keyCode==13){return false;}
 }
 //获取病例输入的内容
+// function getEMRParams(){
+//   const state = store.getState();
+//   const {message} = state.patInfo;
+//   const {mainSuit,currentIll,otherHistory,checkBody,inspect,assistCheck,diagnosticList} = state;
+//   //console.log('message', message)
+//   const main = filterDataArr(mainSuit.saveText)||'',
+//     current=filterDataArr(currentIll.saveText)||'',
+//     other = filterDataArr(otherHistory.saveText)||'',
+//     vital = filterDataArr(checkBody.saveText)||'',
+//     lis = inspect.pushItem,    //化验推送所需数据
+//     pacs = assistCheck.dataString||'',
+//     dis=diagnosticList.diagnosticStrNoType||'',
+//     advice = '',
+//     diseaeId = [];
+//   const age = message.patientAge;
+//   const sex = message.sex;
+//   const patientId = message.patientId //病人id，取上次用药
+//   const hosCode = message.hospitalCode
+//   return {main,current,other,vital,lis,pacs,dis,advice,diseaeId,sex,age, patientId, hosCode};
+// };
 function getEMRParams(){
   const state = store.getState();
   const {message} = state.patInfo;
   const {mainSuit,currentIll,otherHistory,checkBody,inspect,assistCheck,diagnosticList} = state;
   //console.log('message', message)
-  const main = filterDataArr(mainSuit.saveText)||'',
-    current=filterDataArr(currentIll.saveText)||'',
-    other = filterDataArr(otherHistory.saveText)||'',
-    vital = filterDataArr(checkBody.saveText)||'',
-    lis = inspect.pushItem,    //化验推送所需数据
-    pacs = assistCheck.dataString||'',
-    dis=diagnosticList.diagnosticStrNoType||'',
-    advice = '',
-    diseaeId = [];
-  const age = message.patientAge;
-  const sex = message.sex;
-  const patientId = message.patientId //病人id，取上次用药
-  const hosCode = message.hospitalCode
-  return {main,current,other,vital,lis,pacs,dis,advice,diseaeId,sex,age, patientId, hosCode};
+  
+  const diag = []
+  for(let i = 0; i < diagnosticList.diagnosticList.length; i++) {
+    diag.push({"dateValue": "","name": "","uniqueName": diagnosticList.diagnosticList[i].name})
+  }
+  let obj = {
+    "hosCode": message.hospitalCode,
+    "ruleType": "string",
+    "age": message.patientAge,
+    "sex": message.sex,
+    "chief": filterDataArr(mainSuit.saveText)||'',
+    "symptom": filterDataArr(currentIll.saveText)||'',
+    "vital": filterDataArr(checkBody.saveText)||'',
+    "pasts": filterDataArr(otherHistory.saveText)||'',
+    "infectious": "",
+    "operation": "",
+    "allergy": "",
+    "vaccination": "",
+    "personal": "",
+    "marital": "",
+    "family": "",
+    "menstrual": "",
+    "other": filterDataArr(otherHistory.saveText)||'',
+    "lisString": "",
+    "pacsString": "",
+    "diagString": "",
+    "drugString": "",
+    "lis": inspect.pushItem,
+    "pacs": assistCheck.dataArr||'',
+    "diag": diag,
+    "lisOrder": [],
+    "pacsOrder": [],
+    "diagOrder": [],
+    "drugOrder": [],
+    "operationOrder": [],
+    "otherOrder": [],
+    "patientId": message.patientId,
+    "drug": [],
+    "marriage": ""
+  }
+  return obj;
 };
 
 function didPushParamChange(){
@@ -1254,7 +1301,7 @@ function getPushList(data1,data2){     //推送数据
                 tmpObj.source = '1';//数据来源
                 tmpObj.maxValue = part.max || ''; 
                 tmpObj.minValue = part.min || '';
-                tmpObj.time = part.time ||now;
+                tmpObj.dateValue = part.time ||now;
                 tmpObj.units = part.unit || '';//单位
                 tmpObj.value = (part.value-0) === (part.value-0) ? part.value:'';//值
                 tmpObj.otherValue = (part.value-0) === (part.value-0) ?'':part.value; //阴性阳性
@@ -1272,7 +1319,7 @@ function getPushList(data1,data2){     //推送数据
                 tmpObj.source = '0';     //数据来源
                 tmpObj.maxValue = val.maxValue ? val.maxValue : '';
                 tmpObj.minValue = val.minValue ? val.minValue : '';
-                tmpObj.time = val.time || now;
+                tmpObj.dateValue = val.time || now;
                 tmpObj.units = val.labelSuffix || '';
                 tmpObj.value = (val.value-0) === (val.value-0) ? val.value:'';
                 tmpObj.otherValue = (val.value-0) === (val.value-0) ?'':val.value;
@@ -1333,8 +1380,8 @@ function getPushLists(data1,data2){     //推送数据
     return totalTmpArr;
 }
 
-function getAllString(checkedListImport,assistLabel){
-  let tmpImportLis = [],tmpString='';
+function getAllString(checkedListImport,assistLabel,flg){
+  let tmpImportLis = [],tmpString='',tmpArr=[];
   for(let i = 0;i < checkedListImport.length;i++){
     for(let j = 0;j < checkedListImport[i].length;j++){
       tmpImportLis.push(checkedListImport[i][j])
@@ -1343,9 +1390,21 @@ function getAllString(checkedListImport,assistLabel){
   let tempArr = tmpImportLis.concat(assistLabel)
   for (let i = 0; i < tempArr.length; i++) {
     let tmpVal = tempArr[i].value ? tempArr[i].value.trim() : tempArr[i].value;
+    let obj = {
+      "dateValue": tempArr[i].time,
+      "name": "",
+      "uniqueName": tempArr[i].name,
+      "desc": tempArr[i].imagingDiagnose,
+      "result": tempArr[i].imagingDiagnose,
+    }
+    tmpArr.push(obj)
     tmpString += (tempArr[i].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArr[i].time ? '报告日期:' + tempArr[i].time : '') + '^;')
   }
-  return tmpString;
+  if(flg){
+    return tmpArr;
+  }else{
+    return tmpString;
+  }
 }
 
 // 模板中处理tagType==4的数据

src/utils/utils.js

@@ -233,25 +233,15 @@ export function setInputLabel(state,action){
 export async function getBigPush(type,symData,save){
   const emrData = getEMRParams();
   const params = {
-    "age": emrData.age,
-    "hosCode": emrData.hosCode,
-    "featureType": type,  //类型1：症状，4：查体，5：化验，6：辅检，7：诊断
     "ruleType":config.ruleTypeMap[type],
-    "diag": emrData.dis,
-    "lis": emrData.lis,
-    "other": emrData.other,
-    "pasts": emrData.other,
-    "pacs": emrData.pacs,
-    "sex": emrData.sex,
-    "vital":emrData.vital,
-    "symptom": symData||emrData.current + emrData.main
+    "featureType": type,  //类型1：症状，4：查体，5：化验，6：辅检，7：诊断
   };
   if(save){
     let savePm = Object.assign({},params);
     delete savePm.featureType;
     storageLocal.set('emrParam',savePm);      //推送数据存储，用作推送前对比是否有变，有变才推送
   }
-  return json(api.push,params);
+  return json(api.push,Object.assign({},params,emrData));
 }
 
 //删除选中标签