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

business/base-service/src/main/java/com/yihu/jw/hospital/mapping/dao/HospitalDeptMappingDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.hospital.mapping.dao;
import com.yihu.jw.entity.hospital.mapping.HospitalDeptMappingDO;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import javax.transaction.Transactional;
/**
 * Created by zdm on 2019/5/28.
 */
@Transactional
public interface HospitalDeptMappingDao extends PagingAndSortingRepository<HospitalDeptMappingDO, Integer>, JpaSpecificationExecutor<HospitalDeptMappingDO> {
    @Modifying
    @Query("delete from HospitalDeptMappingDO  where source=?1")
    void deleteBySource(String source);
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@@ -3,6 +3,8 @@ package com.yihu.jw.hospital.prescription.service.entrance;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.hospital.mapping.HospitalDeptMappingDO;
import com.yihu.jw.hospital.mapping.dao.HospitalDeptMappingDao;
import com.yihu.jw.hospital.prescription.service.entrance.util.ConvertUtil;
import com.yihu.jw.hospital.prescription.service.entrance.util.MqSdkUtil;
import com.yihu.jw.restmodel.hospital.prescription.WlyyHisPrescriptionVO;
@@ -15,12 +17,14 @@ import io.swagger.annotations.ApiParam;
import net.sf.json.JSONArray;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Controller;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
import javax.transaction.Transactional;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -60,6 +64,8 @@ public class EntranceService {
    private static String MS02013="MS02013";
    //医院频次字典表
    private static String MS30012="MS30012";
    @Autowired
    private HospitalDeptMappingDao hospitalDeptMappingDao;
    public String getJosnFileResullt(String fid) throws Exception {
        String contentStr = null;
@@ -614,7 +620,8 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public JSONArray MS02001(boolean demoFlag) throws Exception {
    @org.springframework.transaction.annotation.Transactional(rollbackFor = Exception.class)
    public List<HospitalDeptMappingDO> MS02001(boolean demoFlag) throws Exception {
        String fid=MS02001;
        String resp="";
        if (demoFlag) {
@@ -631,7 +638,46 @@ public class EntranceService {
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        }
        return ConvertUtil.convertListEnvelopInBody(resp);
        JSONArray jsonArray= ConvertUtil.convertListEnvelopInBody(resp);
        List<HospitalDeptMappingDO> hospitalDeptMappingDOS=new ArrayList<>();
        HospitalDeptMappingDO hdmDo;
        //删除旧数据
        hospitalDeptMappingDao.deleteBySource("1");
        for(Object object:jsonArray){
            hdmDo=new HospitalDeptMappingDO();
            net.sf.json.JSONObject jsonObjectBody=(net.sf.json.JSONObject)object;
            hdmDo.setSerialNo(null==jsonObjectBody.get("Serial_No")?"":jsonObjectBody.get("Serial_No").toString());
            hdmDo.setDeptCode(null==jsonObjectBody.get("Dept_Code")?"":jsonObjectBody.get("Dept_Code").toString());
            hdmDo.setDeptName(null==jsonObjectBody.get("Dept_Name")?"":jsonObjectBody.get("Dept_Name").toString());
            hdmDo.setDeptAlias(null==jsonObjectBody.get("Dept_Alias")?"":jsonObjectBody.get("Dept_Alias").toString());
            hdmDo.setClinicAttr(null==jsonObjectBody.get("Clinic_Attr")?"":jsonObjectBody.get("Clinic_Attr").toString());
            hdmDo.setVisitAdmitFlag(null==jsonObjectBody.get("Visit_Admit_Flag")?"":jsonObjectBody.get("Visit_Admit_Flag").toString());
            hdmDo.setInternalAergeryFlag(null==jsonObjectBody.get("Internal_Sergery_Flag")?"":jsonObjectBody.get("Internal_Sergery_Flag").toString());
            hdmDo.setGraveDeptFlag(null==jsonObjectBody.get("Grave_Dept_Flag")?"":jsonObjectBody.get("Grave_Dept_Flag").toString());
            hdmDo.setConsultDeptFlag(null==jsonObjectBody.get("Consult_Dept_Flag")?"":jsonObjectBody.get("Consult_Dept_Flag").toString());
            hdmDo.setDeptType(null==jsonObjectBody.get("Dept_Type")?"":jsonObjectBody.get("Dept_Type").toString());
            hdmDo.setInputCode(null==jsonObjectBody.get("Input_Code")?"":jsonObjectBody.get("Input_Code").toString());
            hdmDo.setPinyinCode(null==jsonObjectBody.get("Pinyin_Code")?"":jsonObjectBody.get("Pinyin_Code").toString());
            hdmDo.setWubiCode(null==jsonObjectBody.get("Wubi_Code")?"":jsonObjectBody.get("Wubi_Code").toString());
            hdmDo.setDeptTypeCode(null==jsonObjectBody.get("Dept_Type_Code")?"":jsonObjectBody.get("Dept_Type_Code").toString());
            hdmDo.setLocation(null==jsonObjectBody.get("Location")?"":jsonObjectBody.get("Location").toString());
            hdmDo.setDisplaySequence(null==jsonObjectBody.get("Display_Sequence")?"":jsonObjectBody.get("Display_Sequence").toString());
            hdmDo.setOpenBedNum(null==jsonObjectBody.get("Open_Bed_Num")?"":jsonObjectBody.get("Open_Bed_Num").toString());
            hdmDo.setFatherDeptCode(null==jsonObjectBody.get("Father_Dept_Code")?"":jsonObjectBody.get("Father_Dept_Code").toString());
            hdmDo.setFatherDeptName(null==jsonObjectBody.get("Father_Dept_Name")?"":jsonObjectBody.get("Father_Dept_Name").toString());
            hdmDo.setDeptPosition(null==jsonObjectBody.get("Dept_Position")?"":jsonObjectBody.get("Dept_Position").toString());
            hdmDo.setDeptRemark(null==jsonObjectBody.get("Dept_Remark")?"":jsonObjectBody.get("Dept_Remark").toString());
            hdmDo.setDeptAgeLimit(null==jsonObjectBody.get("Dept_Age_Limit")?"":jsonObjectBody.get("Dept_Age_Limit").toString());
            hdmDo.setDeptTelNum(null==jsonObjectBody.get("Dept_Tel_Num")?"":jsonObjectBody.get("Dept_Tel_Num").toString());
            hdmDo.setDeptZipCode(null==jsonObjectBody.get("Dept_Zip_Code")?"":jsonObjectBody.get("Dept_Zip_Code").toString());
            hdmDo.setDeDlid(null==jsonObjectBody.get("De_Dlid")?"":jsonObjectBody.get("De_Dlid").toString());
            hdmDo.setDeLcid(null==jsonObjectBody.get("De_Lcid")?"":jsonObjectBody.get("De_Lcid").toString());
            hdmDo.setSource("1");
            hdmDo.setCreateTime(new Date());
            hospitalDeptMappingDOS.add(hdmDo);
        }
        hospitalDeptMappingDao.save(hospitalDeptMappingDOS);
        return hospitalDeptMappingDOS;
    }
    /**

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/mapping/HospitalDeptMappingDO.java

@@ -0,0 +1,349 @@
package com.yihu.jw.entity.hospital.mapping;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by zdm on 2019/5/28.
 */
@Entity
@Table(name = "wlyy_hospital_dept_mapping")
public class HospitalDeptMappingDO extends IntegerIdentityEntity {
    /**
     * 第三方序号
     */
    private String serialNo;
    /**
     * 科室代码
     */
    private String deptCode;
    /**
     * 科室名称
     */
    private String deptName;
    /**
     * 科室别名
     */
    private String deptAlias;
    /**
     * 临床科室属性
     */
    private String clinicAttr;
    /**
     * 门诊住院科室标志
     */
    private String visitAdmitFlag;
    /**
     * 内外科标志
     */
    private String internalAergeryFlag;
    /**
     * 是否重症监护室
     */
    private String graveDeptFlag;
    /**
     * 是否会诊科室',
     */
    private String consultDeptFlag;
    /**
     * 科室类型
     */
    private String deptType;
    /**
     * 输入码
     */
    private String inputCode;
    /**
     * 拼音码
     */
    private String pinyinCode;
    /**
     * 五笔码
     */
    private String wubiCode;
    /**
     * 科室类型码:6总部7金榜8夏禾
     */
    private String deptTypeCode;
    /**
     * 位置
     */
    private String location;
    /**
     * 显示顺序
     */
    private String displaySequence;
    /**
     * 开放床位数
     */
    private String openBedNum;
    /**
     * 上级科室代码
     */
    private String fatherDeptCode;
    /**
     * 上级科室名称
     */
    private String fatherDeptName;
    /**
     * 科室地理位置
     */
    private String deptPosition;
    /**
     * 科室描述说明
     */
    private String deptRemark;
    /**
     * 挂号年龄限制
     */
    private String deptAgeLimit;
    /**
     * 部门电话
     */
    private String deptTelNum;
    /**
     * 部门邮编
     */
    private String deptZipCode;
    /**
     * 大楼ID
     */
    private String deDlid;
    /**
     * 楼层ID
     */
    private String deLcid;
    /**第三方数据来源：1中山医院*/
    private String source;
    /**
     * 创建时间
     */
    private Date createTime;
    public String getSerialNo() {
        return serialNo;
    }
    public void setSerialNo(String serialNo) {
        this.serialNo = serialNo;
    }
    public String getDeptCode() {
        return deptCode;
    }
    public void setDeptCode(String deptCode) {
        this.deptCode = deptCode;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getDeptAlias() {
        return deptAlias;
    }
    public void setDeptAlias(String deptAlias) {
        this.deptAlias = deptAlias;
    }
    public String getClinicAttr() {
        return clinicAttr;
    }
    public void setClinicAttr(String clinicAttr) {
        this.clinicAttr = clinicAttr;
    }
    public String getVisitAdmitFlag() {
        return visitAdmitFlag;
    }
    public void setVisitAdmitFlag(String visitAdmitFlag) {
        this.visitAdmitFlag = visitAdmitFlag;
    }
    public String getInternalAergeryFlag() {
        return internalAergeryFlag;
    }
    public void setInternalAergeryFlag(String internalAergeryFlag) {
        this.internalAergeryFlag = internalAergeryFlag;
    }
    public String getGraveDeptFlag() {
        return graveDeptFlag;
    }
    public void setGraveDeptFlag(String graveDeptFlag) {
        this.graveDeptFlag = graveDeptFlag;
    }
    public String getConsultDeptFlag() {
        return consultDeptFlag;
    }
    public void setConsultDeptFlag(String consultDeptFlag) {
        this.consultDeptFlag = consultDeptFlag;
    }
    public String getDeptType() {
        return deptType;
    }
    public void setDeptType(String deptType) {
        this.deptType = deptType;
    }
    public String getInputCode() {
        return inputCode;
    }
    public void setInputCode(String inputCode) {
        this.inputCode = inputCode;
    }
    public String getPinyinCode() {
        return pinyinCode;
    }
    public void setPinyinCode(String pinyinCode) {
        this.pinyinCode = pinyinCode;
    }
    public String getWubiCode() {
        return wubiCode;
    }
    public void setWubiCode(String wubiCode) {
        this.wubiCode = wubiCode;
    }
    public String getDeptTypeCode() {
        return deptTypeCode;
    }
    public void setDeptTypeCode(String deptTypeCode) {
        this.deptTypeCode = deptTypeCode;
    }
    public String getLocation() {
        return location;
    }
    public void setLocation(String location) {
        this.location = location;
    }
    public String getDisplaySequence() {
        return displaySequence;
    }
    public void setDisplaySequence(String displaySequence) {
        this.displaySequence = displaySequence;
    }
    public String getOpenBedNum() {
        return openBedNum;
    }
    public void setOpenBedNum(String openBedNum) {
        this.openBedNum = openBedNum;
    }
    public String getFatherDeptCode() {
        return fatherDeptCode;
    }
    public void setFatherDeptCode(String fatherDeptCode) {
        this.fatherDeptCode = fatherDeptCode;
    }
    public String getFatherDeptName() {
        return fatherDeptName;
    }
    public void setFatherDeptName(String fatherDeptName) {
        this.fatherDeptName = fatherDeptName;
    }
    public String getDeptPosition() {
        return deptPosition;
    }
    public void setDeptPosition(String deptPosition) {
        this.deptPosition = deptPosition;
    }
    public String getDeptRemark() {
        return deptRemark;
    }
    public void setDeptRemark(String deptRemark) {
        this.deptRemark = deptRemark;
    }
    public String getDeptAgeLimit() {
        return deptAgeLimit;
    }
    public void setDeptAgeLimit(String deptAgeLimit) {
        this.deptAgeLimit = deptAgeLimit;
    }
    public String getDeptTelNum() {
        return deptTelNum;
    }
    public void setDeptTelNum(String deptTelNum) {
        this.deptTelNum = deptTelNum;
    }
    public String getDeptZipCode() {
        return deptZipCode;
    }
    public void setDeptZipCode(String deptZipCode) {
        this.deptZipCode = deptZipCode;
    }
    public String getDeDlid() {
        return deDlid;
    }
    public void setDeDlid(String deDlid) {
        this.deDlid = deDlid;
    }
    public String getDeLcid() {
        return deLcid;
    }
    public void setDeLcid(String deLcid) {
        this.deLcid = deLcid;
    }
    public String getSource() {
        return source;
    }
    public void setSource(String source) {
        this.source = source;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/MqSdkController.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entrance.controller;
import com.yihu.jw.entity.hospital.mapping.HospitalDeptMappingDO;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.util.ConvertUtil;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
@@ -166,7 +167,7 @@ public class MqSdkController extends EnvelopRestEndpoint {
    @GetMapping(value = "/MS02001")
    @ApiOperation(value = "科室字典  ")
    public ListEnvelop MS02001() throws Exception {
        JSONArray obj = entranceService.MS02001(demoFlag);
        List<HospitalDeptMappingDO> obj = entranceService.MS02001(demoFlag);
        //TODO 待解析 存储入库
        return success(obj);
    }