Merge branch 'dev' of huangwenjie/patient-co-management into dev

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

@@ -415,6 +415,12 @@ public class Prescription extends IdEntity {
         */
        //-1 审核不通过 , 0 审核中, 10 审核通过/待支付 ,21支付失败  20 配药中/支付成功, 21 等待领药 ,30 配送中 ,100配送成功/已完成
        switch (status) {
            case -5: {
                return "线下取消";
            }
            case -4: {
                return "线下退费";
            }
            case -3: {
                return "支付超时";
            }

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

@@ -1,7 +1,9 @@
package com.yihu.wlyy.repository.prescription;
import com.yihu.wlyy.entity.prescription.PrescriptionExpressageLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
@@ -9,7 +11,10 @@ import java.util.List;
 * @author huangwenjie
 * @date 2017/12/22 10:39
 */
public interface PrescriptionExpressageLogDao {
public interface PrescriptionExpressageLogDao extends
		PagingAndSortingRepository<PrescriptionExpressageLog, Long>,
		JpaSpecificationExecutor<PrescriptionExpressageLog> {
	
	/**
	 * 根据处方号获取该处方的物流配送日志,按路由节点发生的时间倒序排序
	 * @param prescriptionCode
@@ -17,4 +22,4 @@ public interface PrescriptionExpressageLogDao {
	 */
	@Query("from PrescriptionExpressageLog p where p.prescriptionCode=?1 order by p.acceptTime desc")
	List<PrescriptionExpressageLog> findByPrescriptionCode(String prescriptionCode);
}
}

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

@@ -297,21 +297,29 @@ public class PrescriptionService {
	 */
	public com.alibaba.fastjson.JSONObject getinfo(String code) {
		Prescription prescription = prescriptionDao.findByCode(code);
		Patient p = patientDao.findByCode(prescription.getPatient());
		String rs = jwPrescriptionService.getRecipe(code, p.getSsc());
		com.alibaba.fastjson.JSONObject r = presModeAdapter.modelToSinglePrescription(rs);
		
		String rState = presCheckStateObj(code);
		if ("1".equals(rState)) {
			r.put("reviewedState", 1);
			r.put("prescriptionCode", "");
		List<PrescriptionInfo> prescriptionInfos = prescriptionInfoDao.findByPrescriptionCode(code);
		PrescriptionReviewed reviewed = prescriptionReviewedDao.findByPrescriptionCode(code);
		List<PrescriptionAdjust> prescriptionAdjusts = prescriptionAdjustDao.findByPrescriptionCodeOrderByIdDesc(code);
		com.alibaba.fastjson.JSONObject rs = new com.alibaba.fastjson.JSONObject();
		prescription.setStatusName("");
		rs.put("prescription", prescription);
		rs.put("createTime", DateUtil.dateToStrLong(prescription.getCreateTime()));
		rs.put("reviewedTime",DateUtil.dateToStrLong(reviewed.getReviewedTime()));
		rs.put("prescriptionInfo", prescriptionInfos);
		rs.put("reviewed", reviewed);
		if (prescription != null && StringUtils.isNotBlank(prescription.getPatient())) {
			rs.put("patient", patientDao.findByCode(prescription.getPatient()));
		} else {
			r.put("reviewedState", 0);
			r.put("prescriptionCode", rState);
			rs.put("patient", "");
		}
		rs.put("diagnosis", prescriptionDiagnosisDao.findByPrescriptionCode(code));
		
		
		return r;
		if (prescriptionAdjusts != null && prescriptionAdjusts.size() > 0) {
			rs.put("prescriptionAdjust", prescriptionAdjusts.get(0));
		} else {
			rs.put("prescriptionAdjust", "");
		}
		return rs;
	}
	
	public String presCheckStateObj(String code) {

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_info_js.jsp

@@ -47,7 +47,7 @@
                                            if(i != 0){
                                                diagnosisinfo = diagnosisinfo +"/"
                                            }
                                            diagnosisinfo = diagnosisinfo + diagnosis[i].healthProblemName;
                                            diagnosisinfo = diagnosisinfo + diagnosis[i].name;
                                        }
                                    }
                                    $('#diagnosisinfo').val(diagnosisinfo);
@@ -57,8 +57,8 @@
                                        var prescriptionInfoStr = "";
                                        for (var i=0;i<prescriptionInfo.length;i++)
                                        {
                                            var str = "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp药品信息:"+prescriptionInfo[i].drugName+"&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp用法:"+prescriptionInfo[i].usageName+"&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp每次 "+prescriptionInfo[i].physicDose+prescriptionInfo[i].drugNumUnitName+prescriptionInfo[i].drugRateName;
                                            str += "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp总量:"+prescriptionInfo[i].physicAmountUnit+prescriptionInfo[i].physicAmountUnitName;
                                            var str = "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp药品信息:"+prescriptionInfo[i].drugName+"&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp用法:"+prescriptionInfo[i].usageName+"&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp每次 "+prescriptionInfo[i].physicDose+prescriptionInfo[i].physicDoseUnitName+prescriptionInfo[i].drugRateName;
                                            str += "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp总量:"+prescriptionInfo[i].num+prescriptionInfo[i].drugNumUnitName;
                                            str += "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp规格:"+prescriptionInfo[i].drugFormat;
                                            prescriptionInfoStr += "<a style=\"margin-left:10px;\">"+str+"</a><br>";
//                                            prescriptionInfoStr += "<div class=\"l-text-wrapper m-form-control\"><input readonly value=\""+str+"\" class=\"fd-input\" type=\"text\"   /></div>";
@@ -73,15 +73,15 @@
//                                            prescriptionInfoStr += "<div class=\"l-text-wrapper m-form-control\"><input readonly value=\""+prescriptionInfo[i].drugFormat+"\" class=\"fd-input\" type=\"text\"   /></div><br>";
                                        }
                                    }
                                    $('#prescriptionInfo_div').html(prescriptionInfoStr)
                                    $('#prescriptionInfo_div').html(prescriptionInfoStr);
                                    //续方状态
                                    var prescriptionStatueName = data.prescription.statusName;
                                    $('#prescriptionStatueName').val(prescriptionStatueName)
                                    $('#prescriptionStatueName').val(prescriptionStatueName);
                                    //续方说明
                                    var reason = data.prescription.reason;
                                    $('#reason').val(reason)
                                    $('#reason').val(reason);
                                    //申请时间
                                    var createTime = data.createTime;
@@ -101,10 +101,14 @@
                                    //审核结果
                                    var status = data.prescription.status;
                                    if(status > 1){
                                        $('#presult').val("审核通过")
                                    }else{
                                        $('#presult').val("审核未通过")
                                    if(status ==  -2){
                                        $('#presult').val("删除")
                                    }else if (status ==  -1){
                                        $('#presult').val("审核失败:"+data.prescription.reason)
                                    }else if (status ==  0){
                                        $('#presult').val("待审核")
                                    }else if (status ==  1){
                                        $('#presult').val("审核成功")
                                    }