Merge remote-tracking branch 'origin/dev' into dev

src/components/BlockLossManage/editBlock.js

@@ -62,8 +62,8 @@ function EditBlock(props) {
         if (!dates || dates.length === 0) {
             return current && current >= moment().endOf('day');
         }
-        const tooLate = dates[0] && current.diff(dates[0], 'days') > 30;
-        const tooEarly = dates[1] && dates[1].diff(current, 'days') > 30;
+        const tooLate = dates[0] && current.diff(dates[0], 'days') > 29;
+        const tooEarly = dates[1] && dates[1].diff(current, 'days') > 29;
         if (!limit) {
             return current && current >= moment().endOf('day') || tooEarly || tooLate;
         } else {
@@ -98,7 +98,6 @@ function EditBlock(props) {
             behospitalCode: values.behospitalCode,
             endDate: values.endDate,
             startDate: values.startDate,
-            isPlacefile:getCookie('isPlacefile')
         }
         post(api.dataCompare, params).then((res) => {
             if (res.data.code === 200) {
@@ -208,6 +207,7 @@ function EditBlock(props) {
                     {type != 3 ?
                         <Form.Item label="日期" name="time" rules={[{ required: true }]} labelAlign="right">
                             <RangePicker
+                            allowClear={false}
                                 placeholder={['开始时间', '结束时间']}
                                 disabledDate={disabledDate}
                                 onCalendarChange={val => setDates(val)}

src/components/BlockLossManage/index.js

@@ -7,7 +7,7 @@ import './index.less'
 import apiObj from '@api/index';
 import EditBlock from './editBlock';
 import BlockContext from './block-context';
-import { disabledDate, getValueFromEvent } from '@utils/index'
+import { getValueFromEvent } from '@utils/index'
 const { post, api, xPost } = apiObj;
 const { RangePicker } = DatePicker;
 const { Option } = Select;
@@ -21,6 +21,7 @@ function BlockLossManage() {
     const [title, setTitle] = useState(0);
     const [visible, setVisible] = useState(false);
     const [size, setSize] = useState(15);
+    const [dates, setDates] = useState([]);
     const [current, setCurrent] = useState(1);
     const [type, setType] = useState(null);
     const [blockData, setBlockData] = useState({});
@@ -67,6 +68,14 @@ function BlockLossManage() {
             }
         })
     }
+    function disabledDate(current) {
+        if (!dates || dates.length === 0) {
+            return current && current >= moment().endOf('day');
+        }
+        const tooLate = dates[0] && current.diff(dates[0], 'days') > 364;
+        const tooEarly = dates[1] && dates[1].diff(current, 'days') > 364;
+        return current && current >= moment().endOf('day') || tooEarly || tooLate;
+    };
     //修改
     function showModal(title, row, type) {
         setVisible(true)
@@ -98,6 +107,7 @@ function BlockLossManage() {
     function userChange() {
         setVisible(false)
         getBlockLossPage();
+        blockLossTypeGather({ startDate: params.startDate, endDate: params.endDate })
         setBlockDetail(null)
     }
     const onFinish = (value) => {
@@ -152,8 +162,8 @@ function BlockLossManage() {
             }
         },
         {
-            title: '更新时间', dataIndex: 'auditTime', key: 'auditTime', render: (text, record) => {
-                return record.auditTime || '-';
+            title: '更新时间', dataIndex: 'gmtModified', key: 'gmtModified', render: (text, record) => {
+                return record.gmtModified || '-';
             }
         },
         {
@@ -191,6 +201,7 @@ function BlockLossManage() {
                                     allowClear={false}
                                     disabledDate={disabledDate} // 限制日期不可选
                                     placeholder={['开始时间', '结束时间']}
+                                    onCalendarChange={val => setDates(val)}
                                 />
                             </Form.Item>
                         </Col>
@@ -241,8 +252,8 @@ function BlockLossManage() {
                                     allowClear
                                 >
                                     <Option value="" key={3}>全部</Option>
-                                    <Option value="0" key={0}>未通过</Option>
-                                    <Option value="1" key={1}>已通过</Option>
+                                    <Option value="0" key={0}>核查未通过</Option>
+                                    <Option value="1" key={1}>核查通过</Option>
                                     <Option value="2" key={2}>未核查</Option>
                                 </Select>
                             </Form.Item>
@@ -312,7 +323,7 @@ function BlockLossManage() {
                         </Col>
                         <Col span={6} order={3} className="box-item">
                             <p>{blockData.outCodeNum || blockData.outCodeNum == 0 ? blockData.outCodeNum : '-'}</p>
-                            <p>病历号丢失</p>
+                            <p>患者信息丢失</p>
                         </Col>
                         <Col span={6} order={4} className="box-item box">
                             <p>{blockData.outLossNum || blockData.outLossNum == 0 ? blockData.outLossNum : '-'}</p>
@@ -330,7 +341,7 @@ function BlockLossManage() {
                         </Col>
                         <Col span={6} order={3} className="box-item">
                             <p>{blockData.inCodeNum || blockData.inCodeNum == 0 ? blockData.inCodeNum : '-'}</p>
-                            <p>病历号丢失</p>
+                            <p>患者信息丢失</p>
                         </Col>
                         <Col span={6} order={4} className="box-item box">
                             <p>{blockData.inLossNum || blockData.inLossNum == 0 ? blockData.inLossNum : '-'}</p>

src/components/DiagManager/addDiag.js

@@ -17,6 +17,7 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
   const [unsaved, setUnsaved] = useState(false);//修改未保存弹窗
   const [icdcode,setIcdcode] = useState((formData||{}).code);
   const [dataList, setDataList] = useState([]);//当前页列表数据
+  const [source, setSource] = useState(0);//来源
   //const TREMTYPE=100;			//常亮，术语类型1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作
   //const initialValues = formData;
 
@@ -41,16 +42,14 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
   //选中（修改）标准词时
   function handleChange(val,item){
 	console.log(33,item)
-	form.setFieldsValue({
-	  source:item.source,
-	});
+	setSource(item.source)
 	setIcdcode(item.code);
   }
   //保存匹配，先验证输入
   function saveMatching(){
 	form.validateFields().then(function(values){
 	  console.log('values:',values,form.getFieldsValue())
-	  onOk({...values,type:4,hospitalId:form.hospitalId})
+	  onOk({...values,type:4,hospitalId:form.hospitalId,source:source})
 	})
   }
   //关闭新增/编辑弹窗
@@ -115,7 +114,7 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
 		  <p className='title'>标准术语</p>
 		  <div className="item-box">
 			<Form.Item
-				name="conceptId"
+				name="uniqueName"
 				label="标准诊断名称"
 				rules={[
 				  {

src/components/FieldProblem/editProblem.js

@@ -73,8 +73,8 @@ function EditBlock(props) {
         if (!dates || dates.length === 0) {
             return current && current >= moment().endOf('day');
         }
-        const tooLate = dates[0] && current.diff(dates[0], 'days') > 30;
-        const tooEarly = dates[1] && dates[1].diff(current, 'days') > 30;
+        const tooLate = dates[0] && current.diff(dates[0], 'days') > 29;
+        const tooEarly = dates[1] && dates[1].diff(current, 'days') > 29;
         if(!limit){
             return current && current >= moment().endOf('day') || tooEarly || tooLate;
         }else{
@@ -83,7 +83,7 @@ function EditBlock(props) {
         
     };
     function cancel() {
-        props.userChange()
+        props.cancel()
     }
     return (
         <>
@@ -209,6 +209,7 @@ function EditBlock(props) {
                     {type != 3 ?
                         <Form.Item label="日期" name="time" rules={[{ required: true }]} labelAlign="right">
                             <RangePicker
+                            allowClear={false}
                                 placeholder={['开始时间', '结束时间']}
                                 disabledDate={disabledDate}
                                 onCalendarChange={val => setDates(val)}

src/components/FieldProblem/index.js

@@ -32,7 +32,8 @@ function FieldProblem() {
         pages: 1,
         current: 1,
         size: 15,
-        desc: ['isSolved', 'solveTime'],
+        asc:['isSolved'],
+        desc: ['solveTime'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
         behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     });
@@ -41,7 +42,8 @@ function FieldProblem() {
         pages: 1,
         current: 1,
         size: size,
-        desc: ['isSolved', 'solveTime'],
+        asc:['isSolved'],
+        desc: ['solveTime'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
         behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     }
@@ -98,7 +100,7 @@ function FieldProblem() {
     function userChange() {
         setVisible(false)
         getColumnResultPage();
-        getColumnResultNumber(date)
+        getColumnResultNumber({ behospitalStartDate: params.behospitalStartDate, behospitalEndDate: params.behospitalEndDate })
         setProblemDetail(null)
     }
     function onSizeChange(current, pageSize) {
@@ -173,8 +175,8 @@ function FieldProblem() {
             }
         },
         {
-            title: '更新时间', dataIndex: 'auditTime', key: 'auditTime', render: (text, record) => {
-                return record.auditTime || '-';
+            title: '更新时间', dataIndex: 'solveTime', key: 'solveTime', render: (text, record) => {
+                return record.solveTime || '-';
             }
         },
         {
@@ -354,7 +356,7 @@ function FieldProblem() {
                     maskClosable={false}
                 >
                     <ProblemContext.Provider value={{ problemDetail, type }}>
-                        <EditProblem userChange={userChange} />
+                        <EditProblem cancel={cancel} userChange={userChange} />
                     </ProblemContext.Provider>
 
                 </Modal>

src/components/FieldRules/addRules.js

@@ -68,6 +68,7 @@ function ContentForm(props) {
     const vilidateRules = {
         required: '${label}不能为空!',
     };
+    console.log(initialValues);
     //获取正则式名称
     function getRegular(name) {
         const param = {
@@ -114,7 +115,6 @@ function ContentForm(props) {
     }
     //表选择
     function tablechange(i, value, options,ins) {
-        console.log(value);
         const formData = form.getFieldsValue();
         if (value) {
             colList[i] = list[options.key].getColumnNameDTOList
@@ -129,21 +129,26 @@ function ContentForm(props) {
         }
         let columnList = formData.columnList;
         if(ins == 1){
-            columnList[i].tableEname = value
+            columnList[i].tableEname = options.val
         }else{
-            columnList[i].tableCname = value
+            columnList[i].tableCname = options.val
         }
-        
         columnList[i].columnCname = undefined
         columnList[i].columnEname = undefined
         form.setFieldsValue({
             columnList: columnList
         });
+        console.log(form.getFieldsValue());
     }
-    function colchange(value, options) {
+    function colchange(i, value, options,ins) {
         const formData = form.getFieldsValue();
         let columnList = formData.columnList;
-        columnList[options.index].id = options.key
+        columnList[i].id = options.key
+        if(ins == 1){
+            columnList[i].columnEname = options.val
+        }else{
+            columnList[i].columnCname = options.val
+        }
         form.setFieldsValue({
             columnList: columnList
         });
@@ -187,6 +192,7 @@ function ContentForm(props) {
         setColList([...colList])
         disable[index] = true
         seDisable([...disable])
+        
     }
     //标准值维护
     function modifyStand(i) {
@@ -291,7 +297,7 @@ function ContentForm(props) {
                                                 <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option,1)} onSearch={cnameSearch} style={{ width: 160 }} placeholder="请选择">
                                                     {tableList.map((item) => {
                                                         return (
-                                                            <Option value={item.tableEname} key={item.index}>{item.tableCname}</Option>
+                                                            <Option value={item.tableCname} val={item.tableEname} key={item.index}>{item.tableCname}</Option>
                                                         )
                                                     })}
                                                 </Select>
@@ -300,7 +306,7 @@ function ContentForm(props) {
                                                 <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option,2)} onSearch={enameSearch} style={{ width: 160 }} placeholder="请选择" >
                                                     {tableList.map((item) => {
                                                         return (
-                                                            <Option value={item.tableCname} key={item.index}>{item.tableEname}</Option>
+                                                            <Option value={item.tableEname} val={item.tableCname} key={item.index}>{item.tableEname}</Option>
                                                         )
                                                     })}
                                                 </Select>
@@ -308,19 +314,19 @@ function ContentForm(props) {
                                         </div>
                                         <div className='item-box'>
                                             <Form.Item label="字段名称（中文）" rules={[{ required: true }]} style={{ width: '50%' }} name={['columnList', i, 'columnCname']} labelAlign="right">
-                                                <Select allowClear showSearch onChange={colchange} onSearch={colmeSearch} style={{ width: 160 }} placeholder="请选择" disabled={disable[i]}>
+                                                <Select allowClear showSearch onChange={(value, option) => colchange(i, value, option,1)} onSearch={colmeSearch} style={{ width: 160 }} placeholder="请选择" disabled={disable[i]}>
                                                     {colList[i].map((item) => {
                                                         return (
-                                                            <Option value={item.columnCname} key={item.id} index={i}>{item.columnCname}</Option>
+                                                            <Option value={item.columnCname} val={item.columnEname} key={item.id} index={i}>{item.columnCname}</Option>
                                                         )
                                                     })}
                                                 </Select>
                                             </Form.Item>
                                             <Form.Item label="字段名称（英文）" rules={[{ required: true }]} name={['columnList', i, 'columnEname']} labelAlign="right">
-                                                <Select allowClear showSearch onChange={colchange} onSearch={coleneSearch} style={{ width: 160 }} placeholder="请选择" disabled={disable[i]}>
+                                                <Select allowClear showSearch onChange={(value, option) => colchange(i, value, option,2)} onSearch={coleneSearch} style={{ width: 160 }} placeholder="请选择" disabled={disable[i]}>
                                                     {colList[i].map((item) => {
                                                         return (
-                                                            <Option value={item.columnEname} key={item.id} index={i}>{item.columnEname}</Option>
+                                                            <Option value={item.columnEname} val={item.columnCname} key={item.id} index={i}>{item.columnEname}</Option>
                                                         )
                                                     })}
                                                 </Select>

src/components/FieldRules/index.js

@@ -176,6 +176,18 @@ function FieldRules() {
         post(api.getByIdColumnVerify, param).then((res) => {
             if (res.data.code === 200) {
                 const data = res.data.data;
+                let obj = []
+                if (data.standardValueList) {
+                    data.standardValueList.forEach(it => {
+                        obj.push({
+                            tit: it
+                        })
+                    });
+                    console.log(obj);
+                } else {
+                    obj = [{ tit: null }]
+                }
+                delete data.standardValueList
                 const arr = {
                     columnList: [{
                         columnCname: data.columnCname,
@@ -185,13 +197,10 @@ function FieldRules() {
                         disable: true,
                         id: data.columnId
                     }],
-                    standardValueList: [{
-                        tit: data.standardvalue,
-                    }],
+                    standardValueList: obj,
                     regularName: data.regular,
                     ...data
                 }
-                console.log(arr);
                 setFiledDetail(arr)
             }
         })
@@ -216,17 +225,66 @@ function FieldRules() {
     function onSelectChange(selectedRowKeys) {
         setSelectedRowKeys(selectedRowKeys);
     };
-    function tableCnameChange(val) {
-        setTableCname(val)
-        setDisable(false)
-        getColumnName('', '', val, '')
+    function tableCnameChange(value, option) {
+        const formData = form.getFieldsValue();
+        setTableCname(value)
+
+        getColumnName('', '', value, '')
+        if (value) {
+            form.setFieldsValue({
+                tableEname: option.val
+            });
+            setDisable(false)
+        } else {
+            form.setFieldsValue({
+                tableEname: undefined,
+                columnCname: undefined,
+                columnEname: undefined,
+            })
+            setDisable(true)
+        }
+
+    }
+    function tableEnameChange(value, option) {
+        setTableEname(value)
+        getColumnName('', '', '', value)
+        if (value) {
+            form.setFieldsValue({
+                tableCname: option.val
+            });
+            setDisable(false)
+        } else {
+            form.setFieldsValue({
+                tableCname: undefined,
+                columnCname: undefined,
+                columnEname: undefined,
+            })
+            setDisable(true)
+        }
     }
-    function tableEnameChange(val) {
-        setTableEname(val)
-        getColumnName('', '', '', val)
-        setDisable(false)
+    function colchange(value, option, ins) {
+        if (ins == 1) {
+            if (value) {
+                form.setFieldsValue({
+                    columnEname: option.val
+                });
+            } else {
+                form.setFieldsValue({
+                    columnEname: undefined
+                })
+            }
+        } else {
+            if (value) {
+                form.setFieldsValue({
+                    columnCname: option.val
+                });
+            } else {
+                form.setFieldsValue({
+                    columnCname: undefined
+                })
+            }
+        }
     }
-
     //返回
     function goBack() {
         setAddVisible(false);
@@ -312,10 +370,10 @@ function FieldRules() {
                     <Row gutter={24}>
                         <Col span={6} key={0}>
                             <Form.Item label="表名称（中文）" name="tableCname">
-                                <Select showSearch allowClear onChange={tableCnameChange} onSearch={cnameSearch} placeholder="请选择">
+                                <Select showSearch allowClear onChange={(value, option) => tableCnameChange(value, option)} onSearch={cnameSearch} placeholder="请选择">
                                     {tableList.map((item) => {
                                         return (
-                                            <Option value={item.tableCname} key={item.tableCname}>{item.tableCname}</Option>
+                                            <Option value={item.tableCname} val={item.tableEname} key={item.tableCname}>{item.tableCname}</Option>
                                         )
                                     })}
                                 </Select>
@@ -323,10 +381,10 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={1}>
                             <Form.Item label="表名称（英文）" name="tableEname">
-                                <Select showSearch allowClear onChange={tableEnameChange} onSearch={enameSearch} placeholder="请选择">
+                                <Select showSearch allowClear onChange={(value, option) => tableEnameChange(value, option)} onSearch={enameSearch} placeholder="请选择">
                                     {tableList.map((item) => {
                                         return (
-                                            <Option value={item.tableEname} key={item.tableEname}>{item.tableEname}</Option>
+                                            <Option value={item.tableEname} val={item.tableCname} key={item.tableEname}>{item.tableEname}</Option>
                                         )
                                     })}
                                 </Select>
@@ -334,10 +392,10 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={2}>
                             <Form.Item label="字段名称（中文）" name="columnCname">
-                                <Select showSearch allowClear onSearch={colmeSearch} placeholder="请选择" disabled={disable}>
-                                    {colList.map((item) => {
+                                <Select showSearch allowClear onChange={(value, option) => colchange(value, option, 1)} onSearch={colmeSearch} placeholder="请选择" disabled={disable}>
+                                    {colList.map((item, i) => {
                                         return (
-                                            <Option value={item.columnCname} key={item.columnCname}>{item.columnCname}</Option>
+                                            <Option value={item.columnCname} val={item.columnEname} key={item.columnCname}>{item.columnCname}</Option>
                                         )
                                     })}
                                 </Select>
@@ -345,10 +403,10 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={3}>
                             <Form.Item label="字段名称（英文）" name="columnEname">
-                                <Select showSearch allowClear onSearch={coleneSearch} placeholder="请选择" disabled={disable}>
-                                    {colList.map((item) => {
+                                <Select showSearch allowClear onChange={(value, option) => colchange(value, option, 2)} onSearch={coleneSearch} placeholder="请选择" disabled={disable}>
+                                    {colList.map((item, i) => {
                                         return (
-                                            <Option value={item.columnEname} key={item.columnEname}>{item.columnEname}</Option>
+                                            <Option value={item.columnEname} val={item.columnCname} key={item.columnEname}>{item.columnEname}</Option>
                                         )
                                     })}
                                 </Select>

src/components/RegularManage/addRegular.js

@@ -59,7 +59,7 @@ function EditBlock(props) {
                 <Form.Item label="正则式名称" name="name" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式名称'},{ max: 30,message:'正则式名称不能超过30个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式名称',}]}>
                     <Input placeholder="请输入" autoComplete='off'/>
                 </Form.Item>
-                <Form.Item label="正则式值" name="val"  rules={[{ required: true,message:'请输入正则式值'},{ max: 512,message:'正则式值不能超过512个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式值',}]}>
+                <Form.Item label="正则式值" name="val" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式值'},{ max: 512,message:'正则式值不能超过512个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式值',}]}>
                     <TextArea
                         autoSize={{ minRows: 5, maxRows: 5 }}
                         placeholder="请输入"

src/components/RegularManage/index.js

@@ -89,6 +89,7 @@ function RegularManage() {
         setTitle(title)
         setType(type)
         setRegularDetail(record)
+        setFlag(0)
         if (type == 2) {
             setFlag(record.relation)
         }