|
@@ -902,7 +902,7 @@ function handleEnter(event){
|
|
|
// };
|
|
|
function getEMRParams(){
|
|
|
const state = store.getState();
|
|
|
- console.log(state,676766767)
|
|
|
+ // console.log(state,676766767)
|
|
|
const {id} = state.historyTemplates && state.historyTemplates.HospitalInfo
|
|
|
const {message} = state.patInfo;
|
|
|
const {mainSuit,currentIll,otherHistory,checkBody,newAdvice,inspect,assistCheck,diagnosticList} = state;
|
|
@@ -910,6 +910,14 @@ function getEMRParams(){
|
|
|
for(let i = 0; i < diagnosticList.diagnosticList.length; i++) {
|
|
|
diag.push({"dateValue": "","name": "","uniqueName": diagnosticList.diagnosticList[i].name})
|
|
|
}
|
|
|
+ let templis = (inspect.labelListSmall).concat(inspect.labelListBig)
|
|
|
+ templis = templis.filter((item)=>!item.check)
|
|
|
+ let temppacs = assistCheck.assistLabel
|
|
|
+ temppacs = temppacs.filter((item)=>!item.check)
|
|
|
+ let tempdrug = newAdvice.labelListBig
|
|
|
+ tempdrug = tempdrug.filter((item)=>!item.check)
|
|
|
+ let tempoperation = newAdvice.labelListSmall
|
|
|
+ tempoperation = tempoperation.filter((item)=>!item.check)
|
|
|
const obj = {
|
|
|
"hosCode": message.hospitalCode,
|
|
|
"age": message.patientAge,
|
|
@@ -920,7 +928,7 @@ function getEMRParams(){
|
|
|
"vital": filterDataArr(checkBody.saveText)||'',
|
|
|
"pasts": filterDataArr(otherHistory.saveText)||'',
|
|
|
"infectious": "",
|
|
|
- "operation": newAdvice.labelListSmall,
|
|
|
+ "operation": tempoperation,
|
|
|
"allergy": "",
|
|
|
"vaccination": "",
|
|
|
"personal": "",
|
|
@@ -932,8 +940,8 @@ function getEMRParams(){
|
|
|
"pacsString": "",
|
|
|
"diagString": "",
|
|
|
"drugString": "",
|
|
|
- "lis": (inspect.labelListSmall).concat(inspect.labelListBig),
|
|
|
- "pacs": assistCheck.assistLabel||[],
|
|
|
+ "lis": templis,
|
|
|
+ "pacs": temppacs||[],
|
|
|
"diag": diag,
|
|
|
"lisOrder": inspect.totalOrder,
|
|
|
"pacsOrder": assistCheck.totalOrder,
|
|
@@ -942,7 +950,7 @@ function getEMRParams(){
|
|
|
"operationOrder": newAdvice.operationOrder,
|
|
|
"otherOrder": [],
|
|
|
"patientId": message.patientId,
|
|
|
- "drug": newAdvice.labelListBig,
|
|
|
+ "drug": tempdrug,
|
|
|
"marriage": "",
|
|
|
"hospitalId": id || ''
|
|
|
}
|