代码修改

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/prescription/PrescriptionInfoDao.java

@@ -13,4 +13,7 @@ import java.util.List;
public interface PrescriptionInfoDao extends PagingAndSortingRepository<PrescriptionInfo, Long>, JpaSpecificationExecutor<PrescriptionInfo> {
    @Query("from PrescriptionInfo p where p.prescriptionCode=?1 and p.del=1")
    List<PrescriptionInfo> findByPrescriptionCode(String prescriptionCode);
    @Query("from PrescriptionInfo p where p.code=?1 and p.del=1")
    PrescriptionInfo findByCode(String code);
}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/prescription/PrescriptionInfo.java

@@ -20,6 +20,7 @@ public class PrescriptionInfo extends IdEntity {
    private String drugCode;               //药品code
    private String drugName;               //药品名称
    private String drugRate;               //吃药频率
    private String drugRateName;          //用药频次名称
    private String drugFormat;             //药品规格
    private Integer num;                    //药品数目
    private Integer isRefrigerate;         //是否冷藏 1是 0否
@@ -302,4 +303,12 @@ public class PrescriptionInfo extends IdEntity {
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getDrugRateName() {
        return drugRateName;
    }
    public void setDrugRateName(String drugRateName) {
        this.drugRateName = drugRateName;
    }
}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/prescription/PrescriptionLog.java

@@ -52,23 +52,45 @@ public class PrescriptionLog extends IdEntity {
    //状态枚举
    public enum PrescriptionLogStatus {
        //续方取消
        pay_outtime("支付超时", -3),
        patient_canel("患者自己取消", -2),
        // 审核不通过
        no_reviewed("审核不通过", -1),
        revieweding("待审核", 0),
        //审核中
        changeing("调整中", 2),
        reviewed_success("审核通过/开方中", 10),
        wait_pay("开方完成/待支付", 20),
        change_success("调整成功",3),
        change_error("调整失败",4),
        Pharmacist_examination_error("药师审核失败",5),
        add_error("开方失败",6),
        reviewed_success(" 医生审核(CA)通过", 10),
        //药师审核中
        Pharmacist_examination("药师审核中",20),
        //开方中/药师审核成功
        adding("开方中/药师审核成功",30),
        //待支付
        wait_pay("开方完成/待支付", 40),
        pay_error("支付失败", 41),
        //配药中
        pay_success("支付成功/待配药", 50),
        //等待领药
        wait_expressage("配药成功/待配送", 60),
        pay_error("支付失败", 21),
        pay_success("支付成功/待配药", 30),
        wait_expressage("配药成功/待配送", 40),
        expressageing_error("配送失败", 41),
        expressageJGS("分配健管师", 42),
        //配送中
        expressageing_error("配送失败", 61),
        expressageJGS("分配健管师", 62),
        expressageing("配送中", 65),
        expressage2hospital("配送到服务站", 69),
        expressageing("配送中", 45),
        expressage2hospital("配送到服务站", 49),
        //已完成
        finish("配送到患者手中/已完成", 100);
        private String name;
@@ -99,7 +121,7 @@ public class PrescriptionLog extends IdEntity {
    private String code;                    //业务流程
    private String prescriptionCode;      //处方code 关联表wlyy_prescription code
    private Date createTime;               //处方创建时间
    private Integer status;                 //状态 (-3 支付过期 -2 患者自己取消 -1 审核不通过 , 0 待审核, 2调整中,3调整成功，4调整失败 10 审核通过/开方中  , 20开方完成/待支付, 21 支付失败 , 30 支付成功/待配药 , 40配药成功/待配送  41配送失败 42分配健管师 45配送中   49配送到服务站  100配送到患者手中/已完成)
    private Integer status;                 //状态 (-3 支付过期 -2 患者自己取消 -1 审核不通过 , 0 待审核, 2调整中 10 审核通过/开方中  , 20开方完成/待支付, 21 支付失败 , 30 支付成功/待配药 , 40配药成功/待配送  41配送失败 42分配健管师 45配送中   49配送到服务站  100配送到患者手中/已完成)
    private Integer type;                   //类型: 1智业对接 2易联众对接  3创建处方 4 审核  5付款 6 配送 7完成
    private String userCode;                  //医生或者患者code

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

@@ -2,14 +2,19 @@ package com.yihu.wlyy.service.service.prescription;
import com.yihu.wlyy.service.common.model.Result;
import com.yihu.wlyy.service.dao.prescription.PrescriptionDao;
import com.yihu.wlyy.service.dao.prescription.PrescriptionInfoDao;
import com.yihu.wlyy.service.dao.prescription.PrescriptionLogDao;
import com.yihu.wlyy.service.entity.prescription.Prescription;
import com.yihu.wlyy.service.entity.prescription.PrescriptionInfo;
import com.yihu.wlyy.service.entity.prescription.PrescriptionLog;
import com.yihu.wlyy.service.service.ZysoftBaseService;
import net.sf.json.JSONArray;
import net.sf.json.JSONException;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -32,24 +37,27 @@ public class PrescriptionService extends ZysoftBaseService{
    private PrescriptionLogDao prescriptionLogDao;
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Autowired
    private PrescriptionInfoDao prescriptionInfoDao;
    private static final String channelTopic = "prescription";
    @Value("${redis.channelTopic}")
    private String channelTopic;
    /**
     * 新增续方日志
     * @param prescription
     */
    public void addPrescriptionLog(Prescription prescription){
    public void addPrescriptionLog(Prescription prescription,String remark){
        PrescriptionLog log = new PrescriptionLog();
        log.setStatus(prescription.getStatus());
        log.setPrescriptionCode(prescription.getCode());
        log.setCode(getCode());
        log.setCreateTime(new Date());
        log.setType(1);
        log.setType(PrescriptionLog.PrescriptionLogType.zy.getValue());
        log.setFlag(1);
        log.setHospital(prescription.getHospital());
        log.setHospitalName(prescription.getHospitalName());
        log.setRemark("接收线下处方调整完成消息");
        log.setRemark(remark);
        log.setUserCode(prescription.getDoctor());
        log.setUserName(prescription.getDoctorName());
        log.setUserType(2);
@@ -65,27 +73,74 @@ public class PrescriptionService extends ZysoftBaseService{
        String error = null;
        String status = "1";
        String errMsg = null;
        String msg = "";
        try{
            JSONObject json = JSONObject.fromObject(jsonObject);
            Integer state= json.getInt("CODE");
            String code = json.getString("RECIPE_NO");
            Prescription prescription = prescriptionDao.findByCode(code);
            if(prescription.getStatus()==2){
                if(state==1){
            Integer CODE= json.getInt("CODE");
            JSONObject pre = json.getJSONObject("Data");
            String prescriptionCode = pre.getString("PRESCRIPTION_CODE");
            Prescription prescription = prescriptionDao.findByCode(prescriptionCode);
            if(prescription.getStatus()==2||prescription.getStatus()==4){
                if(CODE==1){
                    prescription.setStatus(3);
                    prescriptionDao.save(prescription);
                    //调整续方的药品信息
                    JSONArray prescription_detail = pre.getJSONArray("PRESCRIPTION_DETAIL");
                    for(int i =0;i<prescription_detail.size();i++){
                        JSONObject info = prescription_detail.getJSONObject(i);
                        String infoCode = info.getString("SUB_NO");
                        PrescriptionInfo prescriptionInfo = prescriptionInfoDao.findByCode(infoCode);
                        prescriptionInfo.setRemark(info.getString("REMARK"));
                        prescriptionInfo.setBindFlag(info.getString("BIND_FLAG"));
                        prescriptionInfo.setDirection("口服");//药品用法
                        prescriptionInfo.setDrugCode(info.getString("ITEM_CODE"));//药品code
                        prescriptionInfo.setDrugName(info.getString("ITEM_NAME"));//药品名称
                        prescriptionInfo.setDrugRate(info.getString("FREQUENCY"));//吃药频率 FREQUENCY
                        prescriptionInfo.setDrugRateName(info.getString("FREQUENCY_NAME"));
                        prescriptionInfo.setDrugFormat(info.getString("ITEM_SPEC"));//药品规格
                        prescriptionInfo.setPrice(info.getInt("ITEM_PRICE"));//药品单价
                        prescriptionInfo.setNum(info.getInt("ITEM_QUANTITY"));//药品数目
                        prescriptionInfo.setJwSubCode("");//智业子处方号
                        prescriptionInfo.setDrugNumUnit(info.getString("ITEM_UNIT"));//数量单位编码
                        prescriptionInfo.setDrugNumUnitName(info.getString("ITEM_UNIT_NAME"));//数量单位名称
                        prescriptionInfo.setCost(1);//金额
                        prescriptionInfo.setCharge(0);//自付
                        prescriptionInfo.setBindFlag("0");//成组标志, 0.非成组,1.成组
                        prescriptionInfo.setDayCount(info.getInt("DAY_COUNT"));//用药天数
                        prescriptionInfo.setDrugUsage(info.getString("USAGE"));//用药方法编码
                        prescriptionInfo.setUsageName(info.getString("USAGE_NAME"));//用药方法名称
                        prescriptionInfo.setPhysicDose(info.getString("PHYSIC_DOSE"));//用药剂量
                        prescriptionInfo.setPhysicDoseUnit(info.getString("PHYSIC_DOSE_UNIT"));//剂量单位编码
                        prescriptionInfo.setPhysicDoseUnitName(info.getString("PHYSIC_DOSE_UNIT_NAME"));//剂量单位名称
                        prescriptionInfo.setPhysicAmount(info.getString("PHYSIC_AMOUNT"));//用药总量
                        prescriptionInfo.setPhysicAmountUnit(info.getString("PHYSIC_AMOUNT_UNIT"));//总量单位编码
                        prescriptionInfo.setPhysicAmountUnitName(info.getString("PHYSIC_AMOUNT_UNIT_NAME"));//总量单位名称
                        prescriptionInfo.setPhysicInjectPlace("");//注射地点编码
                        prescriptionInfo.setPhysicInjectPlaceName("");//注射地点名称
                        prescriptionInfo.setPhysicSkinTest(info.getString("PHYSIC_SKIN_TEST"));//皮试类型名称
                        prescriptionInfo.setPhysicSkinTestName(info.getString("PHYSIC_SKIN_TEST_NAME"));//皮试类型名称
                        prescriptionInfoDao.save(prescriptionInfo);
                    }
                    // redis 的发布
                    redisTemplate.convertAndSend(channelTopic,JSONObject.fromObject(prescription).toString());
                }else {
                    //调整失败
                    prescription.setStatus(4);
                    prescriptionDao.save(prescription);
                    msg = json.getString("MSG");
                }
                prescriptionDao.save(prescription);
                //新增续方日志
                addPrescriptionLog(prescription);
                addPrescriptionLog(prescription,"接收线下处方调整完成消息-"+msg);
            }
        }catch (JSONException ex){
            ex.printStackTrace();
            error = ex.getMessage();
            errMsg = ex.getMessage();
            status = "0";
        }catch (Exception e){
            e.printStackTrace();
            error = e.getMessage();
@@ -104,7 +159,18 @@ public class PrescriptionService extends ZysoftBaseService{
        String status = "1";
        String errMsg = null;
        try{
            JSONObject json = JSONObject.fromObject(jsonObject);
            Integer code = json.getInt("CODE");
            if(code==1){
                String orderNo = json.getString("ORDER_NO");//挂号编号
                String recipeNo = json.getString("RECIPE_NO");//处方编号
            }
        }catch (JSONException ex){
            ex.printStackTrace();
            error = ex.getMessage();
            errMsg = ex.getMessage();
            status = "0";
        }catch (Exception e){
            e.printStackTrace();
            error = e.getMessage();
@@ -122,7 +188,18 @@ public class PrescriptionService extends ZysoftBaseService{
        String status = "1";
        String errMsg = null;
        try{
            JSONObject json = JSONObject.fromObject(jsonObject);
            Integer code = json.getInt("CODE");
            if(code==1){
                String orderNo = json.getString("ORDER_NO");//挂号编号
                String recipeNo = json.getString("RECIPE_NO");//处方编号
            }
        }catch (JSONException ex){
            ex.printStackTrace();
            error = ex.getMessage();
            errMsg = ex.getMessage();
            status = "0";
        }catch (Exception e){
            e.printStackTrace();
            error = e.getMessage();
@@ -140,7 +217,18 @@ public class PrescriptionService extends ZysoftBaseService{
        String status = "1";
        String errMsg = null;
        try{
            JSONObject json = JSONObject.fromObject(jsonObject);
            Integer code = json.getInt("CODE");
            if(code==1){
                String orderNo = json.getString("ORDER_NO");//挂号编号
                String recipeNo = json.getString("RECIPE_NO");//处方编号
            }
        }catch (JSONException ex){
            ex.printStackTrace();
            error = ex.getMessage();
            errMsg = ex.getMessage();
            status = "0";
        }catch (Exception e){
            e.printStackTrace();
            error = e.getMessage();

patient-co-service/wlyy_service/src/main/resources/application.yml

@@ -63,6 +63,7 @@ spring:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
#    password: jkzl_ehr
    channelTopic : redisAddPrescription
---
spring:
@@ -79,6 +80,7 @@ spring:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
#    password: jkzl_ehr
    channelTopic : redisAddPrescription
---
spring:
  profiles: production
@@ -93,4 +95,5 @@ spring:
  redis:
    host: 120.41.253.95 # Redis server host.
    port: 6380 # Redis server port.
    password: jkzl_ehr
    password: jkzl_ehr
    channelTopic : redisAddPrescription

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionInfo.java

@@ -19,6 +19,7 @@ public class PrescriptionInfo extends IdEntity{
    private String drugCode;               //药品code
    private String drugName;               //药品名称
    private String drugRate;               //吃药频率
    private String drugRateName;          //用药频次名称
    private String drugFormat;             //药品规格
    private Integer num;                    //药品数目
    private Integer isRefrigerate;         //是否冷藏 1是 0否
@@ -301,4 +302,12 @@ public class PrescriptionInfo extends IdEntity{
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getDrugRateName() {
        return drugRateName;
    }
    public void setDrugRateName(String drugRateName) {
        this.drugRateName = drugRateName;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/prescription/PrescriptionReviewedDao.java

@@ -5,6 +5,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2017/8/4.
 */
@@ -12,4 +14,7 @@ public interface PrescriptionReviewedDao extends PagingAndSortingRepository<Pres
    @Query("select p from PrescriptionReviewed p where p.prescriptionCode=?1")
    PrescriptionReviewed findByPrescriptionCode(String prescriptionCode);
    @Query("select p from PrescriptionReviewed p where p.prescriptionCode=?1 and p.status=?2")
    List<PrescriptionReviewed> findByPrescriptionCodeAndStatus(String prescriptionCode, Integer status);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -14,10 +14,7 @@ import com.yihu.wlyy.entity.message.Message;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.PatientFamilyMember;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.patient.prescription.Prescription;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionDiagnosis;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionInfo;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionReviewed;
import com.yihu.wlyy.entity.patient.prescription.*;
import com.yihu.wlyy.repository.consult.ConsultTeamDao;
import com.yihu.wlyy.repository.consult.ConsultTeamDoctorDao;
import com.yihu.wlyy.repository.consult.ConsultTeamLogDao;
@@ -125,7 +122,6 @@ public class ConsultTeamService extends ConsultService {
    private HttpClientUtil HttpClientUtil;
    @Autowired
    private PrescriptionReviewedDao prescriptionReviewedDao;
    @Autowired
    WeiXinAccessTokenUtils accessTokenUtils;
@@ -875,6 +871,7 @@ public class ConsultTeamService extends ConsultService {
    public Integer addPrescriptionConsult(String jwCode,String patient,String agent,String doctorCode,ConsultTeam ct,String reason,Integer type) throws Exception {
        synchronized (jwCode.intern()){
//            PrescriptionReviewed p = prescriptionReviewedDao.findByPrescriptionCodeAndStatus()
            List<Prescription> prescriptionList = prescriptionDao.fingdByJwCodeAndStatus(jwCode,0);
            if(prescriptionList!=null&&prescriptionList.size()>0){//存在未审核的续方
                return -1;
@@ -1045,6 +1042,7 @@ public class ConsultTeamService extends ConsultService {
        prescriptionInfo.setDrugRate("每次1.25mg    q.d.");//吃药频率
        prescriptionInfo.setDrugFormat("2.5mg*80片/盒");//药品规格
        prescriptionInfo.setNum(10);//药品数目
        prescriptionInfo.setPrice(10);//药品单价
        prescriptionInfo.setIsRefrigerate(0);//是否冷藏 1是 0否
        prescriptionInfo.setJwSubCode("");//智业子处方号
        prescriptionInfo.setDrugNumUnit("");//数量单位编码
@@ -1091,7 +1089,7 @@ public class ConsultTeamService extends ConsultService {
        re +=diagnosis.getName();
        prescriptionLogService.addLog(prescription,3,1,1);
        prescriptionLogService.addLog(prescription, PrescriptionLog.PrescriptionLogType.create.getValue(),1,1);
        return re;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionService.java

@@ -1,16 +1,13 @@
package com.yihu.wlyy.service.app.prescription;
import com.yihu.wlyy.entity.patient.prescription.Prescription;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionLog;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionPay;
import com.yihu.wlyy.repository.prescription.PrescriptionDao;
import com.yihu.wlyy.repository.prescription.PrescriptionLogDao;
import com.yihu.wlyy.service.BaseService;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by chenweida on 2017/7/27.
 */
@@ -27,4 +24,72 @@ public class PrescriptionService extends BaseService {
    public Prescription findByCode(String prescriptionCode) {
        return prescriptionDao.findByCode(prescriptionCode);
    }
    /**
     * 返回支付信息
     * @param code
     * @return
     */
    public JSONObject getPayInfo(String code){
        JSONObject json = new JSONObject();
        //处方主信息{"yyksbm":"医生科室编号","bcsfcs":"本次收费次数","yszjhm":"医生证件号码","ysxm00":"医生姓名","mzlb00":"门诊类别","sfydgh":"是否药店挂号",
        // "bcghcs":"本次挂号次数","ghksmc":"挂号科室名称","cfxms0":"明细上传数量","mzlsh0":"医保挂号流水号 如果为空，将自动医保挂号并收费","ghfy00":"挂号费用",
        // "yszjdj":"医师诊金级别","bqbm00":"病情编码","sfygwd":"是否医改网点"}
        json.put("yyksbm","医生科室编号");//医生科室编号
        json.put("bcsfcs",1);//本次收费次数
        json.put("yszjhm","医生证件号码");//医生证件号码
        json.put("ysxm00","医生姓名");//医生姓名
        json.put("mzlb00","门诊类别");//门诊类别
        json.put("sfydgh",1);//是否药店挂号
        json.put("bcghcs",1);//本次挂号次数
        json.put("ghksmc","挂号科室名称");//挂号科室名称
        json.put("cfxms0",1);//明细上传数量
        json.put("mzlsh0","医保挂号流水号");//医保挂号流水号
        json.put("ghfy00",10);//挂号费用
        json.put("yszjdj","医师诊金级别");//医师诊金级别
        json.put("bqbm00","病情编码");//病情编码
        json.put("sfygwd",1);//是否医改网点
        //诊断明细        {"zdms00":"诊断或症状描述","zdbh00":"诊断或症状编码"}
        JSONArray zdInfo = new JSONArray();
        JSONObject j1 = new JSONObject();
        j1.put("zdms00","诊断或症状描述");//诊断或症状描述
        j1.put("zdbh00","诊断或症状编码");//诊断或症状编码
        zdInfo.put(j1);
        json.put("zdInfo",zdInfo);
        //处方明细        {"xmgg00":"项目规格","cfhao0":"处方号","sfybxm":"是否医保项目","dcyydw":"单次用药单位","xmje00":"项目金额","xmbh00":"项目编号",
        // "ysxm00":"医生姓名","yppl00":"药品频率","gytj00":"给药途径","ypts00":"药品天数","xmdj00":"项目单价","qyzl00":"取药总量","ylts00":"药量天数",
        // "sptxbm":"商品条形编码","xmmc00":"项目名称","fpxmbh":"发票项目编号","xmsl00":"项目数量","ypyl00":"药品用量","qyzldw":"取药单位","xmdw00":"项目单位",
        // "jx0000":"剂型"}
        JSONArray cfInfo = new JSONArray();
        JSONObject j2 = new JSONObject();
        j2.put("xmgg00","项目规格");//项目规格
        j2.put("cfhao0","处方号");//处方号
        j2.put("sfybxm",1);//是否医保项目
        j2.put("dcyydw","单次用药单位");//单次用药单位
        j2.put("xmje00",111);//项目金额
        j2.put("xmje00","项目规格");//项目金额
        j2.put("xmbh00","项目编号");//项目编号
        j2.put("ysxm00","医生姓名");//医生姓名
        j2.put("yppl00","药品频率");//药品频率
        j2.put("gytj00","给药途径");//给药途径
        j2.put("ypts00",3);//药品天数
        j2.put("xmdj00",35);//项目单价
        j2.put("qyzl00",4);//取药总量
        j2.put("ylts00",3);//药量天数
        j2.put("sptxbm","商品条形编码");//商品条形编码
        j2.put("xmmc00","项目名称");//项目名称
        j2.put("fpxmbh","发票项目编号");//发票项目编号
        j2.put("xmsl00","项目数量");//项目数量
        j2.put("ypyl00","药品用量");//药品用量
        j2.put("qyzldw","取药单位");//取药单位
        j2.put("qyzl00","药品频率");//取药总量
        j2.put("xmdw00","项目单位");//项目单位
        j2.put("jx0000","剂型");//剂型
        cfInfo.put(j2);
        json.put("zdInfo",cfInfo);
        return json;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -1093,6 +1093,7 @@ public class ConsultController extends WeixinBaseController {
//            json.put("prescriptionDt",prescriptionDiagnosisService.getPrescriptionDiagnosis(prescriptionCode));//续方疾病类型
            json.put("prescriptionInfo",prescriptionDiagnosisService.getPrescriptionInfo(prescriptionCode));//续方药品信息
            json.put("symptoms",consult1.getSymptoms());//咨询类型--- 1高血压，2糖尿病
            json.put("jwCode",prescription.getJwCode());//基位处方code
            return write(200, "查询成功！", "list", json);
        }catch (Exception e){