Bläddra i källkod

诊断信息重新对接

zhouna 3 år sedan
förälder
incheckning
bc50e9d211
3 ändrade filer med 27 tillägg och 32 borttagningar
  1. 5 9
      src/api/request.js
  2. 16 19
      src/components/DiagManager/addDiag.js
  3. 6 4
      src/components/DiagManager/index.js

+ 5 - 9
src/api/request.js

@@ -86,16 +86,12 @@ const request = {
     getRecordTemplatePage:"/daqe-center/recordTemplateManage/getRecordTemplatePage",        //文书模板列表
 	
 	//诊断管理
-	getTermPage:'/mdsp-service/tran/mappingConfig/getPage',//获取术语信息分页列表
+	getTermPage:'/mdsp-service/tran/mappingConfig/getPage',//获取术语信息分页列表(与药品,手术公用)
     termMatching:'/mdsp-service/term/termMatching',             //术语匹配搜索(与药品,手术公用)
-	addDisease:'/daqe-center/diseaseManage/addDisease',//添加诊断
-	delDiseaseById:'/daqe-center/diseaseManage/delDiseaseById',//通过id删除诊断
-	matchingDisease:'/daqe-center/diseaseManage/matchingDisease',//匹配诊断
-	upDiseaseById:'/daqe-center/diseaseManage/upDiseaseById',//修改诊断
-    importDisease:'/daqe-center/diseaseManage/importDisease',//诊断信息导入
-    getDiseaseInfoById:"/daqe-center/diseaseManage/getDiseaseInfoById",   //已匹配诊断信息查看
+    saveOrUpdateRecord:'/mdsp-service/tran/mappingConfig/saveOrUpdateRecord',  //匹配关系保存(与药品,手术公用)
+    deleteRecord:'/mdsp-service/tran/mappingConfig/deleteRecord',   //删除术语(与药品,手术公用)
 	
-	//药品管理
+	/*//药品管理
 	getDrugPage:'/daqe-center/drugManage/getDrugPage',//获取药品分页列表
 	delDrugById:'/daqe-center/drugManage/delDrugById',//通过id删除药品
 	addDrug:'/daqe-center/drugManage/addDrug',//新增药品
@@ -111,7 +107,7 @@ const request = {
 	matchingOperation:'/daqe-center/operationManage/matchingOperation',//匹配手术信息
 	upOperationById:'/daqe-center/operationManage/upOperationById',//通过id修改手术
     importOperation:'/daqe-center/operationManage/importOperation',  //手术导入
-    getOperationById:'/daqe-center/operationManage/getOperationById',   //已匹配标准手术获取
+    getOperationById:'/daqe-center/operationManage/getOperationById',   //已匹配标准手术获取*/
 	
 
     getColumnVerifyPage:'/daqe-center/columnVerifyManagement/getColumnVerifyPage',//字段校验规则维护列表

+ 16 - 19
src/components/DiagManager/addDiag.js

@@ -13,22 +13,24 @@ const { post, api } = apiObj;
 function AddDiag({matchChange,visible,cancel,onOk,title}) {
   const [form] = Form.useForm();
   const { formData } = useContext(DiagContext);
-  console.log('formData',formData)
   const { Option } = Select;
   const [unsaved, setUnsaved] = useState(false);//修改未保存弹窗
-  const [searchTxt,setSearchTxt] = useState((formData||{}).hisName);
   const [icdcode,setIcdcode] = useState((formData||{}).code);
   const [dataList, setDataList] = useState([]);//当前页列表数据
+  const TREMTYPE=100;			//常亮,术语类型1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作
   //const initialValues = formData;
 
+  useEffect(() => {
+	form.setFieldsValue(formData)
+  }, [formData]);
   //标准术语搜索
   function handleSearch(val){
     const txt = val.trim();
-	if(txt==""){
+	if(txt===""){
 		const list = []
 		setDataList(list);
 	}else{
-		post(api.termMatching, {inputStr:txt,type:100}).then((res) => {
+		post(api.termMatching, {inputStr:txt,type:TREMTYPE}).then((res) => {
 		if (res.data.code === "0") {
 			const list = res.data.data||[];
 			setDataList(list);
@@ -37,22 +39,21 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
 	}
   }
   //选中(修改)标准词时
-  function handleChange(val){
-    console.log('选中:',val)
-	setSearchTxt();
-	setIcdcode(val);
+  function handleChange(val,item){
+	//setSearchTxt(item.name);
+	setIcdcode(item.code);
   }
   //保存匹配,先验证输入
   function saveMatching(){
 	form.validateFields().then(function(values){
 	  console.log('values:',values)
-	  onOk({...values,type:4})
+	  onOk({...values,type:TREMTYPE})
 	})
   }
   //关闭新增/编辑弹窗
   function saveCancel(){
     //有未保存修改时弹窗提醒
-    const isChange = form.isFieldsTouched();
+    const isChange = form.isFieldsTouched(['hisName','conceptId']);
     if(isChange){
 	  setUnsaved(true);
 	}else{
@@ -70,7 +71,6 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
 	setUnsaved(false)
   }
   return (
-    <>
 	  <Modal
 		  title={title}
 		  okText='确定'
@@ -83,8 +83,8 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
 		  initialValues={formData}
 	  >
 	  <Form
-		  labelCol={{ span: 6 }}
-		  wrapperCol={{ span: 16 }}
+		  labelCol={{ span: 7 }}
+		  wrapperCol={{ span: 15 }}
 		  className='clearfix'
 		  form={form}
 		  name="register"
@@ -103,16 +103,15 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
 					},{ max: 30,message:'医院诊断名称不能超过30个字符'}
 				  ]}
 			  >
-				<Input value="1" placeholder="请输入" autoComplete='off'/>
+				<Input placeholder="请输入" autoComplete='off'/>
 			  </Form.Item>
 			</div>
-
 		</div>
 		<div className="lt-info info-box">
 		  <p className='title'>标准术语</p>
 		  <div className="item-box">
 			<Form.Item
-				name="uniqueName"
+				name="conceptId"
 				label="标准诊断名称"
 				rules={[
 				  {
@@ -122,13 +121,12 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
 				]}
 			>
 			  <Select placeholder="请输入"
-					  value={searchTxt}
 					  autoComplete='off'
 					  onSearch={handleSearch}
 					  onChange={handleChange}
 					  filterOption={false}
 					  showSearch>
-				{dataList.map(d => <Option key={d.id}>{d.name}</Option>)}
+				{dataList.map(d => <Option key={d.id} code={d.code}>{d.name}</Option>)}
 			  </Select>
 			</Form.Item>
 			<Form.Item
@@ -153,7 +151,6 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
 		  <p>当前数据未保存 是否确认关闭?</p>
 		</Modal>
 	  </Modal>
-    </>
   );
 }
 

+ 6 - 4
src/components/DiagManager/index.js

@@ -19,7 +19,7 @@ function DiagManager() {
   const [title, setTitle] = useState("");//新增/修改的弹窗标题
   const [visible, setVisible] = useState(false);//新增修改 弹窗
   const [delvisible, setDelvisible] = useState(false);//删除 弹窗
-  const [formData, setFormData] = useState(null);//当前行数据
+  const [formData, setFormData] = useState({});//当前行数据
   const [size, setSize] = useState(15);//每页显示条数
   const [total, setTotal] = useState(0);
   const [current, setCurrent] = useState(1);//当前页
@@ -38,12 +38,13 @@ function DiagManager() {
   //新增/修改 弹窗flag=1新增,3修改
   const showModal = (name, flag, Diagrow) => {
     setVisible(true);
-    setTitle(name);
+    setTitle(name);console.log(flag)
     if (flag === 1) {
       setFormData({
         status: 1
       })
     }else if (flag === 3) {
+      console.log(33,Diagrow)
       setFormData(Diagrow)
     }
   }
@@ -63,7 +64,7 @@ function DiagManager() {
   }
   //删除
   function delDiseaseById() {
-    post(api.delDiseaseById, { id: Diagid }).then((res) => {
+    post(api.deleteRecord, { id: Diagid }).then((res) => {
 	  setDelvisible(false);
       if (res.data.code === 200) {
         getDiseasePage();
@@ -123,9 +124,10 @@ function DiagManager() {
   }
 
   function saveMatching(saveParams) {
-    post(api.matchingDisease, saveParams).then((res) => {
+    post(api.saveOrUpdateRecord, saveParams).then((res) => {
       if (res.data.code === 200) {
         message.success("匹配成功");
+        setVisible(false);
         getDiseasePage();
       } else {
         message.warning(res.data.message || "匹配失败,请重试");