Merge branch 'dev' of trick9191/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/DoctorZsInfoDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.doctor.BaseDoctorZsInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/9/16.
 */
public interface DoctorZsInfoDao extends PagingAndSortingRepository<BaseDoctorZsInfoDO, String>, JpaSpecificationExecutor<BaseDoctorZsInfoDO> {
}

business/base-service/src/main/java/com/yihu/jw/hospital/survey/dao/SurveyTemplateOptionDao.java

@@ -11,7 +11,7 @@ import java.util.List;
 */
public interface SurveyTemplateOptionDao extends PagingAndSortingRepository<WlyySurveyTemplateOptionDO, String>, JpaSpecificationExecutor<WlyySurveyTemplateOptionDO> {
    List<WlyySurveyTemplateOptionDO> findByTemplateQuestionCodeAndDelOrderBySortAsc(String templateQuestionCode,String del);
    List<WlyySurveyTemplateOptionDO> findByQuestionCodeAndDelOrderBySortAsc(String questionCode,String del);
    List<WlyySurveyTemplateOptionDO> findByTemplateCodeAndDelOrderBySortAsc(String templateCode,String del);

business/base-service/src/main/java/com/yihu/jw/hospital/survey/service/SurveyService.java

@@ -243,15 +243,15 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
                " FROM " +
                " wlyy_survey_template t ";
        if(StringUtils.isNotBlank(label)){
            totalSql+=" JOIN wlyy_survey_label_info i OM t.id = i.survey_temp_code";
            totalSql+=" JOIN wlyy_survey_label_info i ON t.id = i.survey_temp_code";
        }
        totalSql += " WHERE " +
                    " t.del = '1'";
        if(StringUtils.isNotBlank(title)){
            totalSql += " t.title like '%"+title+"%' ";
            totalSql += " AND t.title like '%"+title+"%' ";
        }
        if(StringUtils.isNotBlank(label)){
            totalSql += " i.label_code ='"+label+"'";
            totalSql += " AND i.label_code ='"+label+"'";
        }
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
@@ -273,15 +273,15 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
                " FROM " +
                " wlyy_survey_template t ";
        if(StringUtils.isNotBlank(label)){
            sql += " JOIN wlyy_survey_label_info i OM t.id = i.survey_temp_code";
            sql += " JOIN wlyy_survey_label_info i ON t.id = i.survey_temp_code";
        }
            sql += " WHERE " +
                   " t.del = '1'";
        if(StringUtils.isNotBlank(title)){
            sql += " t.title like '%"+title+"%' ";
            sql += " AND t.title like '%"+title+"%' ";
        }
        if(StringUtils.isNotBlank(label)){
            sql += " i.label_code ='"+label+"'";
            sql += " AND  i.label_code ='"+label+"'";
        }
        sql += " ORDER BY t.create_time DESC LIMIT " + (page - 1) * size + "," + size + " ";
@@ -317,10 +317,10 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
            //设置选项
            for(WlyySurveyTemplateQuestionVO tq:tqVOs){
                List<WlyySurveyTemplateOptionDO> optionDOs  = surveyTemplateOptionDao.findByTemplateQuestionCodeAndDelOrderBySortAsc(tq.getId(),"1");
                List<WlyySurveyTemplateOptionDO> optionDOs  = surveyTemplateOptionDao.findByQuestionCodeAndDelOrderBySortAsc(tq.getId(),"1");
                List<WlyySurveyTemplateOptionVO> optionVOs = new ArrayList<>();
                convertToModels(optionDOs,optionVOs,WlyySurveyTemplateOptionVO.class);
                tq.setTemplateOptionVOs(optionVOs);
                tq.setOptionVOs(optionVOs);
            }
        }
        return templateVO;
@@ -370,8 +370,8 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
        //保存新问题选项
        if(StringUtils.isNotBlank(tempOpJson)){
            List<WlyySurveyTemplateOptionDO> questions = EntityUtils.jsonToList(tempOpJson, WlyySurveyTemplateOptionDO.class);
            surveyTemplateOptionDao.save(questions);
            List<WlyySurveyTemplateOptionDO> options = EntityUtils.jsonToList(tempOpJson, WlyySurveyTemplateOptionDO.class);
            surveyTemplateOptionDao.save(options);
        }
        //保存标签

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/doctor/BaseDoctorZsInfoDO.java

@@ -0,0 +1,286 @@
package com.yihu.jw.entity.hospital.doctor;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Trick on 2019/9/16.
 */
@Entity
@Table(name = "base_doctor_zs_info")
public class BaseDoctorZsInfoDO extends IntegerIdentityEntity {
    private String staffCode;
    private String staffName;
    private String deptId;
    private String deptName;
    private String idNumber;
    private String sexCode;
    private String sexName;
    private Date dateBirth;
    private String addrHome;
    private String mobileNo;
    private String major;
    private String educationName;
    private String degreeName;
    private Date entryDate;
    private Date arriveHospDate;
    private String staffCategCode;
    private String StaffCategName;
    private String titleLevelCode;
    private String titleLevelName;
    private String staffStatusCode;
    private String staffStatusName;
    private String levelCode;
    private String levelName;
    private String degreeCode;
    private String ethnicCode;
    private String ethnicName;
    private String politicalStatus;
    private String politicalStatusName;
    private String practiceCertificateNo;
    private String skillCertificateNo;
    public String getStaffCode() {
        return staffCode;
    }
    public void setStaffCode(String staffCode) {
        this.staffCode = staffCode;
    }
    public String getStaffName() {
        return staffName;
    }
    public void setStaffName(String staffName) {
        this.staffName = staffName;
    }
    public String getDeptId() {
        return deptId;
    }
    public void setDeptId(String deptId) {
        this.deptId = deptId;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getIdNumber() {
        return idNumber;
    }
    public void setIdNumber(String idNumber) {
        this.idNumber = idNumber;
    }
    public String getSexCode() {
        return sexCode;
    }
    public void setSexCode(String sexCode) {
        this.sexCode = sexCode;
    }
    public String getSexName() {
        return sexName;
    }
    public void setSexName(String sexName) {
        this.sexName = sexName;
    }
    public Date getDateBirth() {
        return dateBirth;
    }
    public void setDateBirth(Date dateBirth) {
        this.dateBirth = dateBirth;
    }
    public String getAddrHome() {
        return addrHome;
    }
    public void setAddrHome(String addrHome) {
        this.addrHome = addrHome;
    }
    public String getMobileNo() {
        return mobileNo;
    }
    public void setMobileNo(String mobileNo) {
        this.mobileNo = mobileNo;
    }
    public String getMajor() {
        return major;
    }
    public void setMajor(String major) {
        this.major = major;
    }
    public String getEducationName() {
        return educationName;
    }
    public void setEducationName(String educationName) {
        this.educationName = educationName;
    }
    public String getDegreeName() {
        return degreeName;
    }
    public void setDegreeName(String degreeName) {
        this.degreeName = degreeName;
    }
    public Date getEntryDate() {
        return entryDate;
    }
    public void setEntryDate(Date entryDate) {
        this.entryDate = entryDate;
    }
    public Date getArriveHospDate() {
        return arriveHospDate;
    }
    public void setArriveHospDate(Date arriveHospDate) {
        this.arriveHospDate = arriveHospDate;
    }
    public String getStaffCategCode() {
        return staffCategCode;
    }
    public void setStaffCategCode(String staffCategCode) {
        this.staffCategCode = staffCategCode;
    }
    public String getStaffCategName() {
        return StaffCategName;
    }
    public void setStaffCategName(String staffCategName) {
        StaffCategName = staffCategName;
    }
    public String getTitleLevelCode() {
        return titleLevelCode;
    }
    public void setTitleLevelCode(String titleLevelCode) {
        this.titleLevelCode = titleLevelCode;
    }
    public String getTitleLevelName() {
        return titleLevelName;
    }
    public void setTitleLevelName(String titleLevelName) {
        this.titleLevelName = titleLevelName;
    }
    public String getStaffStatusCode() {
        return staffStatusCode;
    }
    public void setStaffStatusCode(String staffStatusCode) {
        this.staffStatusCode = staffStatusCode;
    }
    public String getStaffStatusName() {
        return staffStatusName;
    }
    public void setStaffStatusName(String staffStatusName) {
        this.staffStatusName = staffStatusName;
    }
    public String getLevelCode() {
        return levelCode;
    }
    public void setLevelCode(String levelCode) {
        this.levelCode = levelCode;
    }
    public String getLevelName() {
        return levelName;
    }
    public void setLevelName(String levelName) {
        this.levelName = levelName;
    }
    public String getDegreeCode() {
        return degreeCode;
    }
    public void setDegreeCode(String degreeCode) {
        this.degreeCode = degreeCode;
    }
    public String getEthnicCode() {
        return ethnicCode;
    }
    public void setEthnicCode(String ethnicCode) {
        this.ethnicCode = ethnicCode;
    }
    public String getEthnicName() {
        return ethnicName;
    }
    public void setEthnicName(String ethnicName) {
        this.ethnicName = ethnicName;
    }
    public String getPoliticalStatus() {
        return politicalStatus;
    }
    public void setPoliticalStatus(String politicalStatus) {
        this.politicalStatus = politicalStatus;
    }
    public String getPoliticalStatusName() {
        return politicalStatusName;
    }
    public void setPoliticalStatusName(String politicalStatusName) {
        this.politicalStatusName = politicalStatusName;
    }
    public String getPracticeCertificateNo() {
        return practiceCertificateNo;
    }
    public void setPracticeCertificateNo(String practiceCertificateNo) {
        this.practiceCertificateNo = practiceCertificateNo;
    }
    public String getSkillCertificateNo() {
        return skillCertificateNo;
    }
    public void setSkillCertificateNo(String skillCertificateNo) {
        this.skillCertificateNo = skillCertificateNo;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyDeptDO.java

@@ -26,7 +26,7 @@ public class WlyySurveyDeptDO extends IntegerIdentityEntity {
    /**
     * 问卷部门名称
     */
    private String deptCode;
    private String deptName;
    public String getSurveyTempCode() {
        return surveyTempCode;
@@ -44,11 +44,11 @@ public class WlyySurveyDeptDO extends IntegerIdentityEntity {
        this.dept = dept;
    }
    public String getDeptCode() {
        return deptCode;
    public String getDeptName() {
        return deptName;
    }
    public void setDeptCode(String deptCode) {
        this.deptCode = deptCode;
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyInspLabelInfoDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.hospital.survey;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_survey_insp_label_info")
public class WlyySurveyInspLabelInfoDO extends UuidIdentityEntity {
public class WlyySurveyInspLabelInfoDO extends IntegerIdentityEntity {
    private String surveyTempCode;//问卷模板编码',
    private String labelCode;//(筛查类型code)',

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyLabelInfoDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.hospital.survey;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_survey_label_info")
public class WlyySurveyLabelInfoDO extends UuidIdentityEntity {
public class WlyySurveyLabelInfoDO extends IntegerIdentityEntity {
    private String surveyTempCode;//问卷模板编码',
    private String labelCode;//(1满意度、2糖尿病、3高血压、4生活日常，5疾病筛查)',

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyTemplateOptionDO.java

@@ -16,7 +16,7 @@ public class WlyySurveyTemplateOptionDO  {
    private String id;
    private String templateCode;//模板编码',
    private String templateQuestionCode;//模板问题编码',
    private String questionCode;//模板问题编码',关联wlyy_survey_template_question
    private String content;//选项内容',
    private Integer isRequired;//选项说明是否必填（0否 1是）',
    private Integer score;//选项分值',
@@ -43,12 +43,12 @@ public class WlyySurveyTemplateOptionDO  {
        this.templateCode = templateCode;
    }
    public String getTemplateQuestionCode() {
        return templateQuestionCode;
    public String getQuestionCode() {
        return questionCode;
    }
    public void setTemplateQuestionCode(String templateQuestionCode) {
        this.templateQuestionCode = templateQuestionCode;
    public void setQuestionCode(String questionCode) {
        this.questionCode = questionCode;
    }
    public String getContent() {

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -472,5 +472,13 @@ public class BaseHospitalRequestMapping {
        public static final String saveSurveyTemplate  = "/saveSurveyTemplate";
        public static final String delSurveyTemplate  = "/delSurveyTemplate";
        public static final String saveSurveyDept  = "/saveSurveyDept";
        public static final String findSurveyByDept  = "/findSurveyByDept";
        public static final String findDeptBySurvey  = "/findDeptBySurvey";
        public static final String saveSurveyAnswer  = "/saveSurveyAnswer";
        public static final String findAnswerBySurveyTempCode  = "/findAnswerBySurveyTempCode";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/survey/WlyySurveyInspLabelInfoVO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.restmodel.hospital.survey;
import com.yihu.jw.restmodel.UuidIdentityVO;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 * Created by Trick on 2019/9/10.
 */
@ApiModel(value = "WlyySurveyInspLabelInfoVO", description = "问卷模板筛查标签")
public class WlyySurveyInspLabelInfoVO extends UuidIdentityVO {
public class WlyySurveyInspLabelInfoVO extends IntegerIdentityVO {
    @ApiModelProperty(value = "问卷模板编码", example = "模块1")
    private String surveyTempCode;//问卷模板编码',

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/survey/WlyySurveyLabelInfoVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.hospital.survey;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import com.yihu.jw.restmodel.UuidIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 * Created by Trick on 2019/9/10.
 */
@ApiModel(value = "WlyySurveyLabelInfoVO", description = "问卷模板标签")
public class WlyySurveyLabelInfoVO extends UuidIdentityVO {
public class WlyySurveyLabelInfoVO extends IntegerIdentityVO {
    @ApiModelProperty(value = "问卷模板编码", example = "模块1")
    private String surveyTempCode;//问卷模板编码',

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/survey/WlyySurveyTemplateOptionVO.java

@@ -13,7 +13,7 @@ public class WlyySurveyTemplateOptionVO extends UuidIdentityVO {
    @ApiModelProperty(value = "模板编码", example = "模块1")
    private String templateCode;//模板编码',
    @ApiModelProperty(value = "模板问题编码", example = "模块1")
    private String templateQuestionCode;//模板问题编码',
    private String questionCode;//模板问题编码',
    @ApiModelProperty(value = "选项内容", example = "模块1")
    private String content;//选项内容',
    @ApiModelProperty(value = "选项说明是否必填（0否 1是）", example = "模块1")
@@ -37,12 +37,12 @@ public class WlyySurveyTemplateOptionVO extends UuidIdentityVO {
        this.templateCode = templateCode;
    }
    public String getTemplateQuestionCode() {
        return templateQuestionCode;
    public String getQuestionCode() {
        return questionCode;
    }
    public void setTemplateQuestionCode(String templateQuestionCode) {
        this.templateQuestionCode = templateQuestionCode;
    public void setQuestionCode(String questionCode) {
        this.questionCode = questionCode;
    }
    public String getContent() {

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/survey/WlyySurveyTemplateQuestionVO.java

@@ -42,7 +42,7 @@ public class WlyySurveyTemplateQuestionVO extends UuidIdentityVO {
    private Date updateTime;//修改时间',
    @ApiModelProperty(value = "选项", example = "模块1")
    private List<WlyySurveyTemplateOptionVO> templateOptionVOs;
    private List<WlyySurveyTemplateOptionVO> optionVOs;
    public String getTitle() {
        return title;
@@ -148,11 +148,11 @@ public class WlyySurveyTemplateQuestionVO extends UuidIdentityVO {
        this.updateTime = updateTime;
    }
    public List<WlyySurveyTemplateOptionVO> getTemplateOptionVOs() {
        return templateOptionVOs;
    public List<WlyySurveyTemplateOptionVO> getOptionVOs() {
        return optionVOs;
    }
    public void setTemplateOptionVOs(List<WlyySurveyTemplateOptionVO> templateOptionVOs) {
        this.templateOptionVOs = templateOptionVOs;
    public void setOptionVOs(List<WlyySurveyTemplateOptionVO> optionVOs) {
        this.optionVOs = optionVOs;
    }
}

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

@@ -335,6 +335,14 @@ public class MqSdkController extends EnvelopRestEndpoint {
        return success(obj);
    }
    @GetMapping(value = "/MS02014")
    @ApiOperation(value = "医生详细信息同步")
    public ObjEnvelop MS02014() throws Exception {
        int obj = entranceService.MS02014(demoFlag);
        System.out.println("共同步"+obj+"位医生！");
        return success(obj);
    }
    @GetMapping(value = "/ehospitalNotice")
    @ApiOperation(value = "互联网医院通知")
    public ObjEnvelop ehospitalNotice(

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/survey/SurveyEndpoint.java

@@ -117,9 +117,53 @@ public class SurveyEndpoint extends EnvelopRestEndpoint {
    }
    @PostMapping(value = BaseHospitalRequestMapping.WlyySurvey.delSurveyTemplate)
    @ApiOperation(value = "模板-批量删除")
    @ApiOperation(value = "模板-删除模板")
    public ObjEnvelop delSurveyTemplate(@ApiParam(name = "tempId", value = "模板实体json")
                                        @RequestParam(value = "tempId",required = true)String tempId) throws Exception {
        return success(surveyService.delSurveyTemplate(tempId));
    }
    //=================调查问卷居民查询\答题
    @PostMapping(value = BaseHospitalRequestMapping.WlyySurvey.saveSurveyDept)
    @ApiOperation(value = "模板-设置模板发送的科室")
    public ObjEnvelop saveSurveyDept(@ApiParam(name = "tempId", value = "模板实体json")
                                     @RequestParam(value = "tempId",required = true)String tempId,
                                     @ApiParam(name = "sdJsons", value = "部门与科室关系json")
                                     @RequestParam(value = "sdJsons",required = true)String sdJsons)throws Exception {
        return success(surveyService.saveSurveyDept(tempId,sdJsons));
    }
    @GetMapping(value = BaseHospitalRequestMapping.WlyySurvey.findSurveyByDept)
    @ApiOperation(value = "模板-查询部门下发放的问卷")
    public ListEnvelop findSurveyByDept(@ApiParam(name = "dept", value = "科室")
                                        @RequestParam(value = "dept",required = true)String dept)throws Exception {
        return success(surveyService.findSurveyByDept(dept));
    }
    @GetMapping(value = BaseHospitalRequestMapping.WlyySurvey.findDeptBySurvey)
    @ApiOperation(value = "模板-查询模板下的科室")
    public ListEnvelop findDeptBySurvey(@ApiParam(name = "tempId", value = "模板实体json")
                                        @RequestParam(value = "tempId",required = true)String tempId)throws Exception {
        return success(surveyService.findDeptBySurvey(tempId));
    }
    @PostMapping(value = BaseHospitalRequestMapping.WlyySurvey.saveSurveyAnswer)
    @ApiOperation(value = "模板-保存问卷答案")
    public ObjEnvelop saveSurveyAnswer(@ApiParam(name = "suJson", value = "发送状态json")
                                     @RequestParam(value = "suJson",required = true)String suJson,
                                     @ApiParam(name = "suaJsons", value = "答案集合json")
                                     @RequestParam(value = "suaJsons",required = true)String suaJsons)throws Exception {
        return success(surveyService.saveSurveyAnswer(suJson, suaJsons));
    }
    @GetMapping(value = BaseHospitalRequestMapping.WlyySurvey.findAnswerBySurveyTempCode)
    @ApiOperation(value = "模板-查询用户问卷答案")
    public ListEnvelop findAnswerBySurveyTempCode(@ApiParam(name = "patient", value = "居民ID")
                                                  @RequestParam(value = "patient",required = true)String patient,
                                                  @ApiParam(name = "tempId", value = "模板id")
                                                  @RequestParam(value = "tempId",required = true)String tempId)throws Exception {
        return success(surveyService.findAnswerBySurveyTempCode(patient,tempId));
    }
    //=================
}