Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev-1.3.6.1

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionExplain.java

@@ -16,7 +16,7 @@ public class PrescriptionExplain extends IdEntity {
    private String content;//续方说明
    private String del;//是否有效，1有效，0无效
    private Date createTiem;
    private Date createTime;
    public String getContent() {
        return content;
@@ -34,11 +34,11 @@ public class PrescriptionExplain extends IdEntity {
        this.del = del;
    }
    public Date getCreateTiem() {
        return createTiem;
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTiem(Date createTiem) {
        this.createTiem = createTiem;
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

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

@@ -133,6 +133,19 @@ public class PrescriptionService extends ZysoftBaseService{
                        prescriptionInfo.setDrugName(info.getString("ITEM_NAME"));//药品名称
                        prescriptionInfo.setDrugRate(info.getString("FREQUENCY"));//吃药频率 FREQUENCY
                        prescriptionInfo.setDrugRateName(info.getString("FREQUENCY_NAME"));
                        String subjectClass = info.getString("SUBJECT_CLASS");
                        if(StringUtils.isBlank(subjectClass)){//处理默认药品的科目类型为空
                            StringBuffer sql = new StringBuffer("SELECT subject_class from zy_iv_physic_dict WHERE physic_code = ?");
                            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql.toString(),info.getString("ITEM_CODE"));
                            if(list!=null&&list.size()>0){
                                Object subject_class = list.get(0).get("subject_class");
                                if(subject_class!=null){
                                    subjectClass = subject_class.toString();
                                }
                            }
                        }
                        prescriptionInfo.setSubjectClass(subjectClass);//科目编码
                        //prescriptionInfo.setSubjectClass(info.getString("SUBJECT_CLASS"));//"科目类别编码",
                        prescriptionInfo.setDrugFormat(info.getString("ITEM_SPEC"));//药品规格
                        prescriptionInfo.setPrice(CommonUtil.doubleToInt(info.getDouble("ITEM_PRICE")));//药品单价
                        prescriptionInfo.setNum(info.getInteger("ITEM_QUANTITY"));//药品数目
@@ -651,8 +664,8 @@ public class PrescriptionService extends ZysoftBaseService{
            applyTimeEnd = DateUtil.getStringDateShort();
            applyTimeFrom = DateUtil.getNextDay(new Date(),-60);
        }else{
            applyTimeEnd = DateUtil.getNextDay(prescription.getCreateTime(),10);
            applyTimeFrom = DateUtil.getNextDay(prescription.getCreateTime(),-10);
            applyTimeEnd = DateUtil.getNextDay(prescription.getCreateTime(),0);
            applyTimeFrom = DateUtil.getNextDay(prescription.getCreateTime(),-60);
        }
        params.put("applyTimeFrom",applyTimeFrom);
        params.put("applyTimeEnd",applyTimeEnd);
@@ -784,8 +797,16 @@ public class PrescriptionService extends ZysoftBaseService{
    public String getDispUnSettleFeeInfoList(String cardNo, String visitNo,String recipeNo)  throws Exception
    {
        Prescription prescription = prescriptionDao.findByVisitNoAndRecipeNo(visitNo,recipeNo);
        String hos = "";
        if(prescription==null){
            Patient patient = patientDao.findBySsc(cardNo);
            SignFamily signFamily = signFamilyDao.findByPatient(patient.getCode());
            hos = signFamily.getHospital();
        }else {
            hos = prescription.getHospital();
        }
        String[] hospitalMapping = getHospitalMapping(prescription.getHospital()); //获取机构映射
        String[] hospitalMapping = getHospitalMapping(hos); //获取机构映射
        String hospital = hospitalMapping[0];
        String licence = hospitalMapping[1];
//        String licence = "5YGl5bq35LmL6Lev";

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwPrescriptionService.java

@@ -114,7 +114,7 @@ public class JwPrescriptionService {
        try{
            Map<String,String> map = new HashMap<>();
            JSONArray jsonArray = new JSONArray();
            for (int i=0;i<20;i++){
            for (int i=0;i<3;i++){
                if(!map.containsKey(recipeNo)){
                    map.put(recipeNo,recipeNo);
                    String response = getLastRecipe(cardNo,recipeNo,applyTimeFrom,applyTimeEnd);