Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -0,0 +1,13 @@
package com.yihu.jw.hospital.mapping.dao;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/27.
 */
public interface PatientMappingDao extends PagingAndSortingRepository<PatientMappingDO, String>, JpaSpecificationExecutor<PatientMappingDO> {
    PatientMappingDO findByIdcardAndSource(String idcard,String source);
}

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

@@ -0,0 +1,36 @@
package com.yihu.jw.hospital.mapping.service;
import com.alibaba.fastjson.JSONArray;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
/**
 * Created by Trick on 2019/5/27.
 * 互联网医院居民信息映射
 */
@Service
public class PatientMappingService {
    @Autowired
    private PatientMappingDao patientMappingDao;
    @Autowired
    private EntranceService entranceService;
    @Value("${demo.flag}")
    private boolean demoFlag;
    public String findHisPatNo(String idCard)throws Exception{
        PatientMappingDO patientMappingDO = patientMappingDao.findByIdcardAndSource(idCard,"1");
        if(patientMappingDO!=null){
            return patientMappingDO.getMappingCode();
        }
        entranceService.BS15018(null,idCard,demoFlag);
        return null;
    }
}

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

@@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
@@ -47,6 +48,7 @@ import java.util.*;
 * Created by Trick on 2019/5/17.
 */
@Service
@Transactional
public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, PrescriptionDao> {
    @Autowired
@@ -103,9 +105,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        String sql ="SELECT " +
                " p.id, " +
                " p.saas_id AS saasId, " +
                " p.recipe_no AS recipeNo, " +
                " p.visit_no AS visitNo, " +
                " p.real_order AS realOrder," +
                " p.origin_real_order AS originRealOrder," +
                " p.adm_no AS admNo," +
                " p.origin_adm_no AS originAdmNo," +
                " p.serial_no AS serialNo," +
                " p.type AS type, " +
                " p.patient_code AS patientCode, " +
                " p.patient_name AS patientName, " +
@@ -256,6 +260,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        String reservationTime = json.getString("reservationTime");
        Integer consultType = json.getInteger("consultType");
        String originRealOrder = json.getString("originRealOrder");
        String originAdmNo = json.getString("originAdmNo");
        String serialNo = json.getString("serialNo");
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        PatientMedicareCardDO cardDO = basePatientMedicareCardDao.findByTypeAndPatientCodeAndDel(PatientMedicareCardDO.Type.MedicareCard.getType(),patient,"1");
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findOne(doctor);
@@ -321,4 +330,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return true;
    }
    public Boolean cancelPrescription(String prescriptionId){
        WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(prescriptionId);
        prescriptionDO.setStatus(-2);
        return true;
    }
}

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

@@ -0,0 +1,72 @@
package com.yihu.jw.entity.hospital.mapping;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Trick on 2019/5/27.
 */
@Entity
@Table(name = "wlyy_patient_mapping")
public class PatientMappingDO extends UuidIdentityEntity {
    private String patient;
    private String patientName;
    private String idcard;
    private String mappingCode;//第三方居民code',
    private String source;//第三方数据来源：1.中山医院-his',
    private Date createTime;//创建时间',
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public String getMappingCode() {
        return mappingCode;
    }
    public void setMappingCode(String mappingCode) {
        this.mappingCode = mappingCode;
    }
    public String getSource() {
        return source;
    }
    public void setSource(String source) {
        this.source = source;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionDiagnosisDO.java

@@ -24,6 +24,11 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
     */
    private String prescriptionId;
    /**
     * 诊断编码
     */
    private String code;
    /**
     * 诊断结果名称
     */
@@ -49,6 +54,15 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
        this.prescriptionId = prescriptionId;
    }
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "name")
    public String getName() {
        return name;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionDiagnosisVO.java

@@ -28,6 +28,8 @@ public class WlyyPrescriptionDiagnosisVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "关联处方", example = "模块1")
    private String prescriptionId;
    @ApiModelProperty(value = "诊断编码", example = "模块1")
    private String code;
    /**
     * 诊断结果名称
     */
@@ -55,6 +57,14 @@ public class WlyyPrescriptionDiagnosisVO extends UuidIdentityVOWithOperator {
        this.prescriptionId = prescriptionId;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -60,7 +60,13 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return success(BaseHospitalRequestMapping.Prescription.api_success,prescriptionService.checkPrescription(patient));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.cancelPrescription)
    @ApiOperation(value = "居民取消续方", notes = "居民取消续方")
    public ObjEnvelop<Boolean> cancelPrescription(@ApiParam(name = "prescriptionId", value = "续方ID")
                                                      @RequestParam(value = "prescriptionId", required = false) String prescriptionId) {
        return success(BaseHospitalRequestMapping.Prescription.api_success,prescriptionService.cancelPrescription(prescriptionId));
    }
    //===========

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -113,6 +113,9 @@ wechat:
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: true
---
spring:
  profiles: jwtest
@@ -147,6 +150,9 @@ sms:
  clientId: EwC0iRSrcP
myFamily:
  qrCodeFailurTime: 2
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: true
---
spring:
  profiles: prod
@@ -177,4 +183,7 @@ wechat:
sms:
  clientId: EwC0iRSrcP #todo 待配置
myFamily:
  qrCodeFailurTime: 2
  qrCodeFailurTime: 2
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: false