Trick 5 vuotta sitten
vanhempi
commit
5417b7ca96

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

@ -672,7 +672,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                sql = "UPDATE base.wlyy_prescription p SET p.`status`='100',p.pay_status='1' WHERE p.adm_no='" + admNo + "' AND p.real_order='" + realOrder + "' ";
                //变更门诊状态
//                outPatientSql = "UPDATE base.wlyy_outpatient p SET p.`status`='2' WHERE p.adm_no='" + admNo + "'";
//                jdbcTemplate.execute(outPatientSql);d
//                jdbcTemplate.execute(outPatientSql);
            } else {
                //取药类型:1 自取 2快递配送
                sql = "UPDATE base.wlyy_prescription p SET p.`status`='32',p.pay_status='1' WHERE p.adm_no='" + admNo + "' AND p.real_order='" + realOrder + "' ";

+ 11 - 9
business/base-service/src/main/java/com/yihu/jw/internet/service/InternetService.java

@ -12,6 +12,7 @@ import com.yihu.jw.internet.entity.MedicalSkillOrdersDO;
import com.yihu.jw.internet.wsapi.Wsapi;
import com.yihu.jw.internet.wsapi.WsapiProxy;
import com.yihu.jw.message.dao.MessageDao;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.JSONUtils;
import com.yihu.jw.utils.encode.AESUtils;
@ -453,15 +454,16 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("cd_orgSub", orgSub);
                jb.put("app_time",DateUtil.dateToStr(new Date((Long)ins.get("register_date")),"YYYY-MM-DD HH:mm:SS"));
                jb.put("app_dep_code", dept[0].toString());
                jb.put("app_class_code", ins.get(""));
                jb.put("app_class_code", ins.get("code"));
                jb.put("id_doctor", docInterId);
//                jb.put("fg_handle", medicalSkillOrdersDO.getFgHandle());
//                jb.put("handle_time", medicalSkillOrdersDO.getHandleTime());
//                jb.put("pt_name", medicalSkillOrdersDO.getPtName());
//                jb.put("ge_code", medicalSkillOrdersDO.getGeCode());
//                jb.put("card_type", "1");
//                jb.put("id_no", medicalSkillOrdersDO.getIdNo());
//                jb.put("pt_tel", medicalSkillOrdersDO.getPtTel());
                jb.put("fg_handle", "1");
                jb.put("handle_time", DateUtil.dateToStr(new Date((Long)ins.get("create_time")),"YYYY-MM-DD HH:mm:SS"));
                jb.put("pt_name",ins.get("name").toString());
                String sex = IdCardUtil.getSexForIdcard_new(ins.get("idcard").toString());
                jb.put("ge_code", sex=="3"?"9":sex);
                jb.put("card_type", "1");
                jb.put("id_no", ins.get("idcard").toString());
                jb.put("pt_tel", ins.get("mobile").toString());
                jb.put("crt_date",DateUtil.dateToStrLong(DateUtil.getNow()));
                JSONArray jsonArray = new JSONArray();
@ -472,7 +474,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                if("200".equals(resJson.get("msg").toString())){
                    success++;
                }else{
//                    saveErrorLog("6",medicalSkillOrdersDO.getId().toString(),res);
                    saveErrorLog("6",ins.get("id ").toString(),res);
                    error++;
                }
            }