Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit aef9bcf4 by peii
Options

feat: 自助下单增加各种字段

parent d4018b0a
Inline Side-by-side
Showing with 115 additions and 107 deletions
app/action/SelfAction.js
......@@ -433,7 +433,7 @@ export async function requestSurgeryType(global_domain_config, params) {
}
/**
* @description: 请求临调订单各种显示
* @description: 请求自助下单病人各种显示
* @param {*}
* @return {*}
*/
......@@ -442,7 +442,7 @@ export function getLendOrderCodeValues() {
let { global_domain_config, token } = getState().login
const params = {
access_token: token,
value_set_code: 'OBS_MOBILE_LEND_ORDER',
value_set_code: 'OBS_MOBILE_PATIENT_INFO',
}
GetRequest(global_domain_config, getUrlParams('/system/value_set/search', params)).then(res => {
const values = R.pathOr([], ['data', 'sys_values'])(res)
......
app/containers/home/HomePage.js
......@@ -242,7 +242,7 @@ class HomePage extends Component {
const { tabs } = this.state
const businessModule = R.find(R.propEq('code', 'MOBILE_BUSINESS_MODULE'))(tabs)
if (isBlank(businessModule)) return
const lendOrder = R.find(R.propEq('function_code', 'MOBILE_LEND_ORDER'))(businessModule.children)
const lendOrder = R.find(R.propEq('function_code', 'MOBILE_SELF_HELP_ORDER'))(businessModule.children)
if (isBlank(lendOrder)) return
this.props.getLendOrderCodeValues()
......
app/containers/selfOrder/SelfOrderPage.js
......@@ -235,23 +235,23 @@ class SelfOrderPage extends Component {
},
{
id: '21',
title: '性别', // 选择
name: '请选择',
title: '床位', // 选择
value: '',
},
{
id: '22',
title: '年龄', // 输入
title: '手术部位', // 输入
value: '',
},
{
id: '23',
title: '床位',
title: '住院号',
value: '',
},
{
id: '24',
title: '病历号',
title: '借货模板',
name: '请选择',
value: '',
},
{
......@@ -671,12 +671,11 @@ class SelfOrderPage extends Component {
let tempTit = ''
let curTip = '未选择'
const { isLendOrder } = navigation.getParam('params')
const doctorNameProfile = this.decodeDisplayLendProfile('DOCTOR_DISPLAY')
const patientNameProfile = this.decodeDisplayLendProfile('PATIENT_NAME_DISPLAY')
const patientGenderProfile = this.decodeDisplayLendProfile('PATIENT_GENDER_DISPLAY')
const patientAgeProfile = this.decodeDisplayLendProfile('PATIENT_AGE_DISPLAY')
const surgeryNameProfile = this.decodeDisplayLendProfile('SURGERY_NAME')
const hospitalizationNumberProfile = this.decodeDisplayLendProfile('HOSPITALICATION_NUMBER_DISPLAY')
const patientIdProfile = this.decodeDisplayLendProfile('PATIENT_ID_DISPLAY')
const patientBedProfile = this.decodeDisplayLendProfile('PATIENT_BED')
const printProfile = this.decodeDisplayLendProfile('COLLECT_PRINT_TEMPLATE')
for (let chIndex in listOptionData) {
if (
......@@ -700,8 +699,10 @@ class SelfOrderPage extends Component {
(chIndex == 16 && sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 2) ||
(chIndex == 17 && sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 2) ||
(chIndex == 18 && sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 2) ||
(chIndex == 19 && sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 2) &&
(chIndex == 27 && sysProfiles.OBS_MOBILE_NEWSPAPER_DISPLAY > 2)) &&
(chIndex == 19 &&
sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 2 &&
chIndex == 27 &&
sysProfiles.OBS_MOBILE_NEWSPAPER_DISPLAY > 2)) &&
!listOptionData[chIndex].value
) {
tempTit = listOptionData[chIndex].title
......@@ -709,12 +710,11 @@ class SelfOrderPage extends Component {
break
}
if (
isLendOrder &&
((chIndex == 20 && patientNameProfile.required) ||
(chIndex == 21 && patientGenderProfile.required) ||
(chIndex == 22 && patientAgeProfile.required) ||
(chIndex == 21 && patientBedProfile.required) ||
(chIndex == 22 && surgeryNameProfile.required) ||
(chIndex == 23 && hospitalizationNumberProfile.required) ||
(chIndex == 24 && patientIdProfile.required)) &&
(chIndex == 24 && printProfile.required)) &&
!listOptionData[chIndex].value
) {
tempTit = listOptionData[chIndex].title
......@@ -772,9 +772,6 @@ class SelfOrderPage extends Component {
chItem.inputValue = ''
}
}
// if (itemTitle === '手术类型') {
// that.clearInitNameAndValue(8)
// }
}
})
this.setState(
......@@ -1701,6 +1698,42 @@ class SelfOrderPage extends Component {
)
}
/**
* @description: 供货模板打印
* @param {*} curData
* @return {*}
*/
handlePrintTemplate(curData) {
const { sysValueSets } = this.props
if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
const list = R.compose(
R.map(
R.applySpec({
value: R.prop('value_code'),
name: R.prop('value_name'),
}),
),
R.uniqBy(R.prop('value_code')),
R.propOr([], 'SUR_COLLECT_PRINT_TEMPLATE'),
)(sysValueSets)
this.setState(
{
currentTitle: curData.title,
currentItem: {
name: curData.name,
value: curData.value,
},
},
() => {
this.setState({
showTypePop: true,
listCurrentOption: list,
})
},
)
}
}
// 备注 输入
handleRemarkInput(text, curData) {
let { listOptionData } = this.state
......@@ -1958,17 +1991,16 @@ class SelfOrderPage extends Component {
sysValues.OBS_MOBILE_NEWSPAPER_DISPLAY > 0 && (tempSubOption.newspaper_order_id = state.listOptionData[27].value)
const patientNameProfile = this.decodeDisplayLendProfile('PATIENT_NAME_DISPLAY')
const patientGenderProfile = this.decodeDisplayLendProfile('PATIENT_GENDER_DISPLAY')
const patientAgeProfile = this.decodeDisplayLendProfile('PATIENT_AGE_DISPLAY')
const surgeryNameProfile = this.decodeDisplayLendProfile('SURGERY_NAME')
const hospitalizationNumberProfile = this.decodeDisplayLendProfile('HOSPITALICATION_NUMBER_DISPLAY')
const patientIdProfile = this.decodeDisplayLendProfile('PATIENT_ID_DISPLAY')
isLendOrder && patientNameProfile.show && (tempSubOption.patient_name = state.listOptionData[20].value)
isLendOrder && patientGenderProfile.show && (tempSubOption.patient_gender = state.listOptionData[21].value)
isLendOrder && patientAgeProfile.show && (tempSubOption.patient_age = state.listOptionData[22].value)
isLendOrder &&
hospitalizationNumberProfile.show &&
(tempSubOption.hospitalization_number = state.listOptionData[23].value)
isLendOrder && patientIdProfile.show && (tempSubOption.patient_id = state.listOptionData[24].value)
const patientBedProfile = this.decodeDisplayLendProfile('PATIENT_BED')
const printProfile = this.decodeDisplayLendProfile('COLLECT_PRINT_TEMPLATE')
patientNameProfile.show && (tempSubOption.patient_name = state.listOptionData[20].value)
patientBedProfile.show && (tempSubOption.patient_bed = state.listOptionData[21].value)
surgeryNameProfile.show && (tempSubOption.surgery_name = state.listOptionData[22].value)
hospitalizationNumberProfile.show && (tempSubOption.hospitalization_number = state.listOptionData[23].value)
printProfile.show && (tempSubOption.collect_print_template = state.listOptionData[24].value)
sysValues.OBS_MOBILE_SUPPLYMENT_DISPLAY > 0 && (tempSubOption.supplement_flag = state.listOptionData[25].value)
sysValues.OBS_MOBILE_LONG_COLLECT_DISPLAY > 0 && (tempSubOption.is_long_collected = state.listOptionData[26].value)
......@@ -1977,7 +2009,7 @@ class SelfOrderPage extends Component {
access_token: props.token,
data: { ...tempSubOption },
}
console.log('params=', params)
console.warn('params=', params)
props.requestSelfSumbit(params)
}
......@@ -2314,12 +2346,11 @@ class SelfOrderPage extends Component {
const isShowOrg = R.compose(R.equals('Y'), R.prop('OBS_SHOW_ORG_FLAG'))(sysProfiles)
const { isLendOrder } = navigation.getParam('params')
const doctorNameProfile = this.decodeDisplayLendProfile('DOCTOR_DISPLAY')
const patientNameProfile = this.decodeDisplayLendProfile('PATIENT_NAME_DISPLAY')
const patientGenderProfile = this.decodeDisplayLendProfile('PATIENT_GENDER_DISPLAY')
const patientAgeProfile = this.decodeDisplayLendProfile('PATIENT_AGE_DISPLAY')
const surgeryNameProfile = this.decodeDisplayLendProfile('SURGERY_NAME')
const hospitalizationNumberProfile = this.decodeDisplayLendProfile('HOSPITALICATION_NUMBER_DISPLAY')
const patientIdProfile = this.decodeDisplayLendProfile('PATIENT_ID_DISPLAY')
const patientBedProfile = this.decodeDisplayLendProfile('PATIENT_BED')
const printProfile = this.decodeDisplayLendProfile('COLLECT_PRINT_TEMPLATE')
return (
<View style={styles.list_cont}>
......@@ -2445,22 +2476,6 @@ class SelfOrderPage extends Component {
listCallBack={() => this.handleShipCheck(listOptionData[4])}
listHasArrow={true}
/>
{isLendOrder ? (
doctorNameProfile.show && (
<PageListArrow
listActOpa={0.8}
listHasAster={doctorNameProfile.required}
listItem={listOptionData[5]}
listName={'name'}
listTitle={'title'}
listCallBack={() => this.handleDoctorCheck(listOptionData[5])}
listHasArrow={true}
listOtherInput={'请输入主治医生'}
otherInput={'showInput'}
otherInputCallBack={text => this.handleDoctorInput(text, listOptionData[5])}
/>
)
) : (
<PageListArrow
listActOpa={0.8}
// listHasAster={true}
......@@ -2473,40 +2488,22 @@ class SelfOrderPage extends Component {
otherInput={'showInput'}
otherInputCallBack={text => this.handleDoctorInput(text, listOptionData[5])}
/>
)}
{/* <PageListArrow
listActOpa={.8}
listHasAster={true}
listItem={listOptionData[6]}
listInputPlace={'请输入'}
listDefaValue={'value'}
listTitle={'title'}
inputCallBack={(text) => this.handleSurNameInput(text, listOptionData[6])}
isTitInputStyle={true}
/> */}
{patientBedProfile.show && (
<PageListArrow
listActOpa={0.8}
listHasAster={true}
listItem={listOptionData[6]}
listName={'name'}
listTitle={'title'}
listCallBack={() => this.handleSurDateCheck(listOptionData[6])}
listHasArrow={true}
/>
{sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 1 && (
<PageListArrow
listActOpa={0.8}
listItem={listOptionData[19]}
listHasAster={sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 2}
listHasAster={patientBedProfile.required}
listItem={listOptionData[21]}
listName={'name'}
listTitle={'title'}
listCallBack={() => this.handleSurTypeCheck(listOptionData[19])}
listHasArrow={true}
listInputPlace={`请输入${listOptionData[21].title}`}
inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[21])}
isTitInputStyle={true}
listCellStyle={styles.list_cell_box}
/>
)}
{isLendOrder && patientNameProfile.show && (
{patientNameProfile.show && (
<PageListArrow
listHasAster={true}
listActOpa={0.8}
listItem={listOptionData[20]}
listDefaValue={'value'}
listHasAster={patientNameProfile.required}
......@@ -2517,23 +2514,24 @@ class SelfOrderPage extends Component {
listCellStyle={styles.list_cell_box}
/>
)}
{isLendOrder && patientGenderProfile.show && (
{hospitalizationNumberProfile.show && (
<PageListArrow
listActOpa={0.8}
listHasAster={patientGenderProfile.required}
listItem={listOptionData[21]}
listName={'name'}
listItem={listOptionData[23]}
listDefaValue={'value'}
listHasAster={hospitalizationNumberProfile.required}
listTitle={'title'}
listCallBack={() => this.handleGenderCheck(listOptionData[21])}
listHasArrow={true}
listInputPlace={`请输入${listOptionData[23].title}`}
inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[23])}
isTitInputStyle={true}
listCellStyle={styles.list_cell_box}
/>
)}
{isLendOrder && patientAgeProfile.show && (
{surgeryNameProfile.show && (
<PageListArrow
listHasAster={true}
listItem={listOptionData[22]}
listDefaValue={'value'}
listHasAster={patientAgeProfile.required}
listHasAster={surgeryNameProfile.required}
listTitle={'title'}
listInputPlace={`请输入${listOptionData[22].title}`}
inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[22])}
......@@ -2541,32 +2539,27 @@ class SelfOrderPage extends Component {
listCellStyle={styles.list_cell_box}
/>
)}
{isLendOrder && hospitalizationNumberProfile.show && (
<PageListArrow
listActOpa={0.8}
listHasAster={true}
listItem={listOptionData[23]}
listDefaValue={'value'}
listHasAster={hospitalizationNumberProfile.required}
listItem={listOptionData[6]}
listName={'name'}
listTitle={'title'}
listInputPlace={`请输入${listOptionData[23].title}`}
inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[23])}
isTitInputStyle={true}
listCellStyle={styles.list_cell_box}
listCallBack={() => this.handleSurDateCheck(listOptionData[6])}
listHasArrow={true}
/>
)}
{isLendOrder && patientIdProfile.show && (
{sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 1 && (
<PageListArrow
listHasAster={true}
listItem={listOptionData[24]}
listDefaValue={'value'}
listHasAster={patientIdProfile.required}
listActOpa={0.8}
listItem={listOptionData[19]}
listHasAster={sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 2}
listName={'name'}
listTitle={'title'}
listInputPlace={`请输入${listOptionData[24].title}`}
inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[24])}
isTitInputStyle={true}
listCellStyle={styles.list_cell_box}
listCallBack={() => this.handleSurTypeCheck(listOptionData[19])}
listHasArrow={true}
/>
)}
<PageListArrow
listActOpa={0.8}
listHasAster={true}
......@@ -2586,6 +2579,18 @@ class SelfOrderPage extends Component {
listHasArrow={true}
listMaxLines={1}
/>
{printProfile.show && (
<PageListArrow
listItem={listOptionData[24]}
listHasAster={printProfile.required}
listTitle={'title'}
listName={'name'}
listCallBack={() => this.handlePrintTemplate(listOptionData[24])}
isTitInputStyle={true}
listHasArrow={true}
listCellStyle={styles.list_cell_box}
/>
)}
<PageListArrow
listActOpa={0.8}
listHasAster={true}
......@@ -2966,6 +2971,7 @@ const mapStateToProps = state => {
local_sele_pro_options: state.selfOrder.local_sele_pro_options,
sysProfiles: state.login.sysProfiles,
lend_order_value_profiles: state.selfOrder.lend_order_value_profiles,
sysValueSets: state.login.sysValueSets,
}
}
......
app/containers/selfOrder/module/ChooseProductPage.js
......@@ -140,7 +140,7 @@ class ChooseProductPage extends Component {
item = R.mergeDeepLeft(topItem, item)
}
return item
})(originManufacterList)
})(originManufacterList || [])
setSelectProductOpts(res)
this.props.navigation.state.params.productCallBack(res)
......
app/reducers/module/login.js
......@@ -42,6 +42,7 @@ const defaultState = {
SUR_FEE_TYPE: [],
SUR_ORDER_TYPE: [],
ORTHOPEDICS_PRODUCT_CLASS: [],
SUR_COLLECT_PRINT_TEMPLATE: []
},
organizations: [],
}
......@@ -68,6 +69,7 @@ export const originSysValueSets = {
SUR_FEE_TYPE: [],
SUR_ORDER_TYPE: [],
ORTHOPEDICS_PRODUCT_CLASS: [],
SUR_COLLECT_PRINT_TEMPLATE: []
}
export default login = (state = defaultState, action) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment