Skip to content

L
long-tern-care-service
Commit fe324942 authored by zhangch's avatar zhangch
Browse files
Options

Merge branch 'master' of gitee.com:shanghai_heng_ge_information/long-term-care

parents fe4eba5d 0c3cf93c
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 40 deletions
apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml
View file @ fe324942
...@@ -17,13 +17,14 @@ ...@@ -17,13 +17,14 @@
a.gender gender, a.gender gender,
a.OPER_CERTI_CODE operCertiCode, a.OPER_CERTI_CODE operCertiCode,
a.fixed_tel fixedTel, a.fixed_tel fixedTel,
a.srv_mode_id srvModeId, m.SRV_MODE_NAME srvModeName,
a.disease disease, a.disease disease,
a.eff_time effTime, a.eff_time effTime,
a.data_from dataFrom, a.data_from dataFrom,
a.ADRESS_DETAIL adressDetail a.APPLY_STATUS applyStatus
from CH_DISABLE_APPLY a,CH_FND_ORGAN o from CH_DISABLE_APPLY a,CH_FND_ORGAN o,CH_FND_SRV_MODE m
where a.organ_id = o.ORGAN_ID where a.organ_id = o.ORGAN_ID
and a.srv_mode_id = m.SRV_MODE_ID
<if test="organId != null and organId != ''"> <if test="organId != null and organId != ''">
<if test="isIncludeSubsidiaries == '0'"> <if test="isIncludeSubsidiaries == '0'">
and a.organ_id in (select organ_id form CH_FND_ORGAN where PARENT_ID = #{organId}) and a.organ_id in (select organ_id form CH_FND_ORGAN where PARENT_ID = #{organId})
...@@ -70,44 +71,44 @@ ...@@ -70,44 +71,44 @@
a.REGIST regist, a.REGIST regist,
a.FIXED_TEL fixedTel, a.FIXED_TEL fixedTel,
a.TREATMENT_TYPE treatmentType, a.TREATMENT_TYPE treatmentType,
a.ACPT_PROVINCIAL acptProvincial, a.ACPT_PROVINCIAL acptProvincial,
a.ACPT_CITY acptCity, a.ACPT_CITY acptCity,
a.ACPT_AREA acptArea, a.ACPT_AREA acptArea,
a.ACPT_STREET acptStreet, a.ACPT_STREET acptStreet,
a.ACPT_ADDRESS acptAddress, a.ACPT_ADDRESS acptAddress,
a.ACPT_SRV_PROVINCIAL acptSrvProvincial, a.ACPT_SRV_PROVINCIAL acptSrvProvincial,
a.ACPT_SRV_CITY acptSrvCity, a.ACPT_SRV_CITY acptSrvCity,
a.ACPT_SRV_AREA acptSrvArea, a.ACPT_SRV_AREA acptSrvArea,
a.ACPT_SRV_STREET acptSrvStreet, a.ACPT_SRV_STREET acptSrvStreet,
a.ACPT_SRV_ROAD_DETAIL acptSrvRoadDetail, a.ACPT_SRV_ROAD_DETAIL acptSrvRoadDetail,
a.ADRESS_DISTRICT_PROVINCIAL adressDistrictProvincial, a.ADRESS_DISTRICT_PROVINCIAL adressDistrictProvincial,
a.ADRESS_DISTRICT_CITY adressDistrictCity, a.ADRESS_DISTRICT_CITY adressDistrictCity,
a.ADRESS_DISTRICT_CODE adressDistrictCode, a.ADRESS_DISTRICT_CODE adressDistrictCode,
a.ADDRESS_ROAD_DETAIL addressRoadDetail, a.ADDRESS_ROAD_DETAIL addressRoadDetail,
a.ADDRESS_NUMBER_DETAIL addressNumberDetail, a.ADDRESS_NUMBER_DETAIL addressNumberDetail,
a.DISEASE disease, a.DISEASE disease,
a.APPLY_METHOD applyMethod, a.APPLY_METHOD applyMethod,
a.DISEASE_DESC diseaseDesc, a.DISEASE_DESC diseaseDesc,
a.MEDICAL_CARD medicalCard, a.MEDICAL_CARD medicalCard,
a.MEDICAL_TYPE medicalType, a.MEDICAL_TYPE medicalType,
a.SRV_ORGAN_ID srvOrganId, a.SRV_ORGAN_ID srvOrganId,
o.PERMIT_ID permitId, o.PERMIT_ID permitId,
a.OPER_NAME operName, a.OPER_NAME operName,
a.OPER_CERTI_CODE operCertiCode, a.OPER_CERTI_CODE operCertiCode,
a.OPER_TEL operTel, a.OPER_TEL operTel,
a.OPER_RELATION operRelation, a.OPER_RELATION operRelation,
a.OPER_FIXED_TEL operFixedTel, a.OPER_FIXED_TEL operFixedTel,
a.OPER_DISTRICT_PROVINCE operDistrictProvince, a.OPER_DISTRICT_PROVINCE operDistrictProvince,
a.OPER_DISTRICT_CITY operDistrictCity, a.OPER_DISTRICT_CITY operDistrictCity,
a.OPER_DISTRICT_CODE operDistrictCode, a.OPER_DISTRICT_CODE operDistrictCode,
a.OPER_STREET operStreet, a.OPER_STREET operStreet,
a.OPER_ADDRESS operAddress, a.OPER_ADDRESS operAddress,
a.CHECK_NAME checkName, a.CHECK_NAME checkName,
a.APPLY_STATUS applyStatus, a.APPLY_STATUS applyStatus,
a.CHECK_REMARK checkRemark a.CHECK_REMARK checkRemark
from CH_DISABLE_APPLY a, from CH_DISABLE_APPLY a,
CH_SRV_ORGAN o CH_SRV_ORGAN o
where a.APPLY_ID = #{applyId} where a.APPLY_ID = #{applyId}
......
common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableVO.java
View file @ fe324942
...@@ -38,7 +38,7 @@ public class DisableVO { ...@@ -38,7 +38,7 @@ public class DisableVO {
//失能人员联系方式 //失能人员联系方式
private String fixedTel; private String fixedTel;
//申请服务方式 //申请服务方式
private String srvModeId; private String srvModeName;
//诊断疾病 //诊断疾病
private String disease; private String disease;
//申请时间 //申请时间
...@@ -46,5 +46,5 @@ public class DisableVO { ...@@ -46,5 +46,5 @@ public class DisableVO {
//申请来源 //申请来源
private String dataFrom; private String dataFrom;
//审核状态 //审核状态
private String adressDetail; private String applyStatus;
} }
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 to comment