Skip to content

L
long-tern-care-service
Commit 189b0956 authored by 蔡镇泽's avatar 蔡镇泽
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents af8487ba a8e4531d
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 405 deletions
apply/apply-service/src/main/java/com/hungraim/ism/ApplyApplication.java
View file @ 189b0956
package com.hungraim.ism; package com.hungraim.ism;
import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
import com.baomidou.mybatisplus.extension.incrementer.OracleKeyGenerator;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Bean;
/** /**
* 申请服务 * 申请服务
...@@ -16,4 +19,14 @@ public class ApplyApplication { ...@@ -16,4 +19,14 @@ public class ApplyApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(ApplyApplication.class, args); SpringApplication.run(ApplyApplication.class, args);
} }
/**
* 注册oracle生成器
* @return 返回mybatis-plus默认的oracle生成器
*/
@Bean
public IKeyGenerator getKeyGenerator() {
return new OracleKeyGenerator();
}
} }
apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml
View file @ 189b0956
...@@ -60,11 +60,10 @@ ...@@ -60,11 +60,10 @@
<select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO"> <select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO">
select a.organ_id organId, select a.organ_id organId,
(select o1.organ_name from CH_FND_ORGAN o1 where a.organ_id = o1.organ_code) organName, a.DISTRICT_PROVINCIAL districtProvincial,
a.DISTRICT_PROVINCIAL provincial, a.DISTRICT_CITY districtCity,
a.DISTRICT_CITY city, a.DISTRICT_AREA districtArea,
a.DISTRICT_AREA area, a.REAL_NAME realName,
a.REAL_NAME name,
a.CERTI_CODE certiCode, a.CERTI_CODE certiCode,
a.BIRTHDAY birthday, a.BIRTHDAY birthday,
a.GENDER gender, a.GENDER gender,
...@@ -89,7 +88,7 @@ ...@@ -89,7 +88,7 @@
a.ADDRESS_NUMBER_DETAIL addressNumberDetail, a.ADDRESS_NUMBER_DETAIL addressNumberDetail,
a.DISEASE disease, a.DISEASE disease,
a.APPLY_METHOD applyMethod, a.SRV_MODE_ID srvModeId,
a.DISEASE_DESC diseaseDesc, a.DISEASE_DESC diseaseDesc,
a.MEDICAL_CARD medicalCard, a.MEDICAL_CARD medicalCard,
a.MEDICAL_TYPE medicalType, a.MEDICAL_TYPE medicalType,
...@@ -111,7 +110,7 @@ ...@@ -111,7 +110,7 @@
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
LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.organ_code LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID
where a.APPLY_ID = #{applyId} where a.APPLY_ID = #{applyId}
</select> </select>
......
common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableExamineInfoVO.java
View file @ 189b0956
package com.hungraim.ism.pojo.vo.disable; package com.hungraim.ism.pojo.vo.disable;
import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* 失能审核信息详情VO * 失能审核信息详情VO
*/ */
@Data
public class DisableExamineInfoVO { public class DisableExamineInfoVO {
//***失能人员个人信息 //***失能人员个人信息
//机构 //机构
private String organId; private String organId;
private String organName; private String organName;
//所在省市 //所在省市
private String provincial; private String districtProvincial;
private String city; private String districtCity;
private String area; private String districtArea;
//申请人签名 //申请人姓名
private String name; private String realName;
//身份证号码 //身份证号码
private String certiCode; private String certiCode;
//出生年月日 //出生年月日
...@@ -54,7 +57,7 @@ public class DisableExamineInfoVO { ...@@ -54,7 +57,7 @@ public class DisableExamineInfoVO {
//诊断疾病 //诊断疾病
private String disease; private String disease;
//申请服务方式 //申请服务方式
private String applyMethod; private String srvModeId;
//病情描述及诊断 //病情描述及诊断
private String diseaseDesc; private String diseaseDesc;
//社会保障卡号 //社会保障卡号
...@@ -94,396 +97,4 @@ public class DisableExamineInfoVO { ...@@ -94,396 +97,4 @@ public class DisableExamineInfoVO {
private String applyStatus; private String applyStatus;
//备注 //备注
private String checkRemark; private String checkRemark;
public List<ExamineRecord> getExamineRecords() {
return examineRecords;
}
public void setExamineRecords(List<ExamineRecord> examineRecords) {
this.examineRecords = examineRecords;
}
public String getOrganId() {
return organId;
}
public void setOrganId(String organId) {
this.organId = organId;
}
public String getOrganName() {
return organName;
}
public void setOrganName(String organName) {
this.organName = organName;
}
public String getProvincial() {
return provincial;
}
public void setProvincial(String provincial) {
this.provincial = provincial;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCertiCode() {
return certiCode;
}
public void setCertiCode(String certiCode) {
this.certiCode = certiCode;
}
public Date getBirthday() {
return birthday;
}
public void setBirthday(Date birthday) {
this.birthday = birthday;
}
public String getGender() {
return gender;
}
public void setGender(String gender) {
this.gender = gender;
}
public String getTel() {
return tel;
}
public void setTel(String tel) {
this.tel = tel;
}
public String getRegist() {
return regist;
}
public void setRegist(String regist) {
this.regist = regist;
}
public String getFixedTel() {
return fixedTel;
}
public void setFixedTel(String fixedTel) {
this.fixedTel = fixedTel;
}
public String getTreatmentType() {
return treatmentType;
}
public void setTreatmentType(String treatmentType) {
this.treatmentType = treatmentType;
}
public String getAcptProvincial() {
return acptProvincial;
}
public void setAcptProvincial(String acptProvincial) {
this.acptProvincial = acptProvincial;
}
public String getAcptCity() {
return acptCity;
}
public void setAcptCity(String acptCity) {
this.acptCity = acptCity;
}
public String getAcptArea() {
return acptArea;
}
public void setAcptArea(String acptArea) {
this.acptArea = acptArea;
}
public String getAcptStreet() {
return acptStreet;
}
public void setAcptStreet(String acptStreet) {
this.acptStreet = acptStreet;
}
public String getAcptAddress() {
return acptAddress;
}
public void setAcptAddress(String acptAddress) {
this.acptAddress = acptAddress;
}
public String getAcptSrvProvincial() {
return acptSrvProvincial;
}
public void setAcptSrvProvincial(String acptSrvProvincial) {
this.acptSrvProvincial = acptSrvProvincial;
}
public String getAcptSrvCity() {
return acptSrvCity;
}
public void setAcptSrvCity(String acptSrvCity) {
this.acptSrvCity = acptSrvCity;
}
public String getAcptSrvArea() {
return acptSrvArea;
}
public void setAcptSrvArea(String acptSrvArea) {
this.acptSrvArea = acptSrvArea;
}
public String getAcptSrvStreet() {
return acptSrvStreet;
}
public void setAcptSrvStreet(String acptSrvStreet) {
this.acptSrvStreet = acptSrvStreet;
}
public String getAcptSrvRoadDetail() {
return acptSrvRoadDetail;
}
public void setAcptSrvRoadDetail(String acptSrvRoadDetail) {
this.acptSrvRoadDetail = acptSrvRoadDetail;
}
public String getAdressDistrictProvincial() {
return adressDistrictProvincial;
}
public void setAdressDistrictProvincial(String adressDistrictProvincial) {
this.adressDistrictProvincial = adressDistrictProvincial;
}
public String getAdressDistrictCity() {
return adressDistrictCity;
}
public void setAdressDistrictCity(String adressDistrictCity) {
this.adressDistrictCity = adressDistrictCity;
}
public String getAdressDistrictCode() {
return adressDistrictCode;
}
public void setAdressDistrictCode(String adressDistrictCode) {
this.adressDistrictCode = adressDistrictCode;
}
public String getAddressRoadDetail() {
return addressRoadDetail;
}
public void setAddressRoadDetail(String addressRoadDetail) {
this.addressRoadDetail = addressRoadDetail;
}
public String getAddressNumberDetail() {
return addressNumberDetail;
}
public void setAddressNumberDetail(String addressNumberDetail) {
this.addressNumberDetail = addressNumberDetail;
}
public String getDisease() {
return disease;
}
public void setDisease(String disease) {
this.disease = disease;
}
public String getApplyMethod() {
return applyMethod;
}
public void setApplyMethod(String applyMethod) {
this.applyMethod = applyMethod;
}
public String getDiseaseDesc() {
return diseaseDesc;
}
public void setDiseaseDesc(String diseaseDesc) {
this.diseaseDesc = diseaseDesc;
}
public String getMedicalCard() {
return medicalCard;
}
public void setMedicalCard(String medicalCard) {
this.medicalCard = medicalCard;
}
public String getMedicalType() {
return medicalType;
}
public void setMedicalType(String medicalType) {
this.medicalType = medicalType;
}
public String getSrvOrganId() {
return srvOrganId;
}
public void setSrvOrganId(String srvOrganId) {
this.srvOrganId = srvOrganId;
}
public String getPermitId() {
return permitId;
}
public void setPermitId(String permitId) {
this.permitId = permitId;
}
public String getOperName() {
return operName;
}
public void setOperName(String operName) {
this.operName = operName;
}
public String getOperCertiCode() {
return operCertiCode;
}
public void setOperCertiCode(String operCertiCode) {
this.operCertiCode = operCertiCode;
}
public String getOperTel() {
return operTel;
}
public void setOperTel(String operTel) {
this.operTel = operTel;
}
public String getOperRelation() {
return operRelation;
}
public void setOperRelation(String operRelation) {
this.operRelation = operRelation;
}
public String getOperFixedTel() {
return operFixedTel;
}
public void setOperFixedTel(String operFixedTel) {
this.operFixedTel = operFixedTel;
}
public String getOperDistrictProvince() {
return operDistrictProvince;
}
public void setOperDistrictProvince(String operDistrictProvince) {
this.operDistrictProvince = operDistrictProvince;
}
public String getOperDistrictCity() {
return operDistrictCity;
}
public void setOperDistrictCity(String operDistrictCity) {
this.operDistrictCity = operDistrictCity;
}
public String getOperDistrictCode() {
return operDistrictCode;
}
public void setOperDistrictCode(String operDistrictCode) {
this.operDistrictCode = operDistrictCode;
}
public String getOperStreet() {
return operStreet;
}
public void setOperStreet(String operStreet) {
this.operStreet = operStreet;
}
public String getOperAddress() {
return operAddress;
}
public void setOperAddress(String operAddress) {
this.operAddress = operAddress;
}
public String getCheckName() {
return checkName;
}
public void setCheckName(String checkName) {
this.checkName = checkName;
}
public String getApplyStatus() {
return applyStatus;
}
public void setApplyStatus(String applyStatus) {
this.applyStatus = applyStatus;
}
public String getCheckRemark() {
return checkRemark;
}
public void setCheckRemark(String checkRemark) {
this.checkRemark = checkRemark;
}
} }
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