问题修改

src/api/request.js

@@ -90,7 +90,7 @@ const request = {
     termMatching:'/mdsp-service/term/termMatching',             //术语匹配搜索（与药品，手术公用）
     saveOrUpdateRecord:'/mdsp-service/tran/mappingConfig/saveOrUpdateRecord',  //匹配关系保存（与药品，手术公用）
     deleteRecord:'/mdsp-service/tran/mappingConfig/deleteRecord',   //删除术语（与药品，手术公用）
-	
+	index:'/mdsp-service/demo/retrieval/index',//术语检索
 	/*//药品管理
 	getDrugPage:'/daqe-center/drugManage/getDrugPage',//获取药品分页列表
 	delDrugById:'/daqe-center/drugManage/delDrugById',//通过id删除药品

src/components/DiagManager/addDiag.js

@@ -21,7 +21,7 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
   const [formList, setFormList] = useState([]);//当前页列表数据
   const [source, setSource] = useState(0);//来源
   //const TREMTYPE=100;			//常亮，术语类型1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作
-
+	const hospitalId = getCookie('hospitalId')
   useEffect(() => {
 	setIcdcode(formData.code)
 	form.setFieldsValue(formData)
@@ -33,9 +33,9 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
 		const list = []
 		setDataList(list);
 	}else{
-		post(api.termMatching, {inputStr:txt,type:termSType}).then((res) => {
+		post(api.index, {inputStr:txt,type:termSType,hospitalId:hospitalId}).then((res) => {
 		if (res.data.code === "0") {
-			const list = res.data.data||[];
+			const list = res.data.data.nameList||[];
 			setDataList(list);
 		}
 		})
@@ -48,9 +48,9 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
   		const list = []
   		setFormList(list);
   	}else{
-  		post(api.termMatching, {inputStr:txt,type:102}).then((res) => {
-  		if (res.data.code === "0") {
-  			const list = res.data.data||[];
+  		post(api.index, {inputStr:txt,type:15,hospitalId:hospitalId}).then((res) => {
+		if (res.data.code === "0") {
+  			const list = res.data.data.nameList||[];
   			setFormList(list);
   		}
   		})
@@ -66,11 +66,11 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
   function handleChange1(val,item){
   	
   }
+  
   //保存匹配，先验证输入
   function saveMatching(){
 	form.validateFields().then(function(values){
 	  console.log('values:',values,form.getFieldsValue())
-	  const hospitalId = getCookie('hospitalId')
 	  const param={
 		  conceptId:parseFloat(values.uniqueName)||formData.conceptId,
 		  formConceptId:parseFloat(values.form)||formData.formConceptId,

src/components/DiagManager/index.js

@@ -282,7 +282,7 @@ function DiagManager() {
 		  </ConfigProvider>
       </div>
       {/*<DiagContext.Provider value={{ formData }}>*/}
-        <AddDiag formData={formData}  termSType={100} termType={4} onOk={saveMatching} title={title} visible={visible} cancel={cancel}  flag={flag}/>
+        <AddDiag formData={formData}  termSType={4} termType={4} onOk={saveMatching} title={title} visible={visible} cancel={cancel}  flag={flag}/>
       {/*</DiagContext.Provider>*/}
       <Modal
         maskClosable={false}

src/components/DocTemplate/index.js

@@ -50,6 +50,7 @@ function DocTemplate() {
 		if(data.type==="2"){					//模板类型,0:未知，1:html，2:xml
 		  setVisible(flag);
 		  setTmplInfo(data);
+		  console.log(data.content)
 		}else{
 		  const myWindow=window.open('','','width=800,height=600');
 		  myWindow.document.write(data.content);

src/components/DrugManager/index.js

@@ -299,7 +299,7 @@ function DrugManager() {
 			  </Spin>
 			  </ConfigProvider>
 		</div>
-		  <AddTerm formData={formData}  termSType={101} termType={5} onOk={saveMatching} title={title} visible={visible} cancel={cancel} flag={flag}/>
+		  <AddTerm formData={formData}  termSType={5} termType={5} onOk={saveMatching} title={title} visible={visible} cancel={cancel} flag={flag}/>
 		<Modal
 			maskClosable={false}
 			title="删除药品信息"

src/components/DutyRecord/index.js

@@ -22,8 +22,8 @@ function DutyRecord() {
 	const [current, setCurrent] = useState(1);
 	const [selectedRowKeys, setSelectedRowKeys] = useState([]);
 	const [params, setParams] = useState({
-		changeTimeEnd:today+" 23:23:59",
-		changeTimeStart:lastmonthday+" 00:00:00",
+		changeTimeEnd:today.split('/').join('-') + ' 23:23:59',
+		changeTimeStart:lastmonthday.split('/').join('-') + ' 00:00:00',
 		pages: 1,
 		current: 1,
 		size: 15
@@ -34,8 +34,8 @@ function DutyRecord() {
 		'2': '职称变更'
 	};
 	let data = {
-		changeTimeEnd:today+" 23:23:59",
-		changeTimeStart:lastmonthday+" 00:00:00",
+		changeTimeEnd:today.split('/').join('-') + ' 23:23:59',
+		changeTimeStart:lastmonthday.split('/').join('-') + ' 00:00:00',
 		pages: 1,
 		current: 1,
 		size: size

src/components/SurgeryManager/index.js

@@ -281,7 +281,7 @@ function SurgManager() {
 			  </Spin>
 			  </ConfigProvider>
 		</div>
-		  <AddTerm formData={formData}  termSType={106} termType={6} onOk={saveMatching} title={title} visible={visible} cancel={cancel}  flag={flag}/>
+		  <AddTerm formData={formData}  termSType={6} termType={6} onOk={saveMatching} title={title} visible={visible} cancel={cancel}  flag={flag}/>
 		<Modal
 			maskClosable={false}
 			title="删除手术/操作信息"