Merge branch 'innterfaceUpdate' into dev/new1

src/containers/AssistCheck.js

@@ -9,7 +9,7 @@ import {ISREAD,HIDEDROP} from '@store/types/homePage.js';
 import {billing, getConceptDetail} from '@store/async-actions/pushMessage';
 import { getCalendarDate} from '@utils/tools';
 
-function mapStateToProps(state) {//console.log(state)
+function mapStateToProps(state) {//console.log(state.typeConfig)
     return {
         list:state.assistCheck.list,
         assistLabel:state.assistCheck.assistLabel,

src/store/actions/typeConfig.js

@@ -28,7 +28,7 @@ export const setReadMode=(state,action)=>{
   res.readMode = action.readMode||(action.readConfig&&action.readConfig[0]);
   if(action.readConfig){
     res.readConfig = action.readConfig;
-    res.isPreIcss = action.isPreIcss
   }
+  res.isPreIcss = action.isPreIcss||false
   return res;
 };

src/store/async-actions/preIcss.js

@@ -7,7 +7,7 @@ import {Notify} from '@commonComp';
 
 export const getPreMsg = () => {
     let baseList = store.getState().patInfo.message;
-    json('/api/prec/inquiryInfo/hisInquirys', {
+    json('/api/prec/inquiryInfo/hisInquirysForIcss', {
         "isHaveDetail":1,
         "hospitalCode": baseList.hospitalCode,
         "dayLimit":config.preIcss.deadline===-1?undefined:config.preIcss.deadline,
@@ -35,27 +35,25 @@ export const tellPred = () => {
     let idcon = baseData.patInfo.message;
     const inCode = config.preIcss.recordIdVal===-1?getUrlArgObject("recordId"):config.preIcss.recordIdVal;
     json('/api/prec/inquiryInfo/inquiryQuoteForIcss', {
-        "hospitalCode": baseList.hospitalCode,
-        "inquiryCode":inCode,
-        "patientCode": baseList.patientCode,
-        "patientIdentityNum":idcon.patientIdentityNum,
-        "doctorCode":baseList.doctorCode,
-        "doctorId": baseList.doctorId,
-        "doctorName":baseList.doctorName,
-        "hospitalDeptCode":baseList.hospitalDeptCode,
-        "hospitalDeptId": baseList.hospitalDeptId,
-        "hospitalDeptName":baseList.hospitalDeptName,
-        "hospitalId": baseList.hospitalId,
-        "hospitalName":baseList.hospitalName,
+        "hospitalCode": idcon.hospitalCode,
+        "hospitalId": idcon.hospitalId,
+        "hospitalName":idcon.hospitalName,
+        "inquiryCode":idcon.recordId,
+        "patientCode": idcon.patientCode,
+        "patientIdentityNum":idcon.patientIdentityNum||null,
+        "doctorCode":idcon.doctorCode,
+        "doctorId": idcon.doctorId,
+        "doctorName":idcon.doctorName,
+        "hospitalDeptCode":idcon.hospitalDeptCode,
+        "hospitalDeptId": idcon.hospitalDeptId,
+        "hospitalDeptName":idcon.hospitalDeptName,
         "inquiryId": baseList.id,
-        "patientId": baseList.patientId,
-        "patientIdNo":baseList.patientIdNo,
-        "patientName":baseList.patientName,
-        "patientPhone":baseList.patientPhone,
-        "patientSex": baseList.patientSex,
-        "sonHospitalCode":baseList.sonHospitalCode,
-        "sonHospitalId": baseList.sonHospitalId,
-        "sonHospitalName":baseList.sonHospitalName
+        "patientId": idcon.patientId,
+        "patientIdNo":idcon.patientIdNo,
+        "patientName":idcon.patientName,
+        "patientPhone":idcon.patientPhone||null,
+        "patientSex": idcon.patientSex=='男'?1:idcon.patientSex=='女'?2:3,
+        "patientBirthday": idcon.birthday
     },true).then((res) => {
       
     })

src/store/async-actions/print.js

@@ -13,8 +13,11 @@ import {
     filterOtherDataArr
 } from '@utils/tools';
 export const getConceptDetails = (bool) => {
-    tellPred()
     let baseList = store.getState();
+    let isPreIcss = baseList.typeConfig.isPreIcss;
+    if(isPreIcss){
+        tellPred()
+    }
     let disLis = baseList.diagnosticList.diagnosticList||[];
     let tmpLis  = [];
     for(let i = 0;i < disLis.length;i++){

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'; //周铁刚