diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/CommonController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/CommonController.java
index 4a76d15..856cece 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/CommonController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/CommonController.java
@@ -50,16 +50,22 @@ public class CommonController {
             tkrecord.setHxgroupid(gLst.get(0).getHxgroupid());
         }
 
+        String hxgroupid=tkrecord.getHxgroupid();
+        tkrecord.setHxgroupid(null);
         List<LymsTkrecord> tLst=lymsTkrecordService.list(Wrappers.query(tkrecord).orderByDesc("createdtime"));
         if (tLst.size()>0){
             tkrecord=tLst.get(0);
             tkrecord.setStat(1);
             tkrecord.setUpdatedtime(new Date());
             tkrecord.setUpdatedby(updateby);
+            tkrecord.setHxgroupid(hxgroupid);
             boolean f=lymsTkrecordService.saveOrUpdate(tkrecord);
 
             baseResponse.setErrorcode(f==true?0:1);
         }
+        if(baseResponse.getErrorcode()==1){
+            baseResponse.setErrormsg("该问诊已结束!");
+        }
         return baseResponse;
     }
 }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
index 5c3e089..ffb4bb9 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
@@ -90,6 +90,9 @@ public class PatientController {
         if (Objects.nonNull(qtype) && qtype == 2) {//从医院购买
             queryWrapper.inSql("id", "SELECT t.`pid` FROM lyms_tcard t WHERE t.`fid`=2");
         }
+        if(StringUtils.isEmpty(patientInfo.getPname())){
+            patientInfo.setPname(null);
+        }
         Page<PatientInfo> patientPagePage = patientInfoService.page(page, queryWrapper);
         List<PatientInfo> pLst = patientInfoService.list(queryWrapper);
         int daiCnt = pLst.parallelStream().mapToInt(PatientInfo::getCcnt).sum();//待使用数量
@@ -121,13 +124,16 @@ public class PatientController {
         BaseResponse baseResponse = new BaseResponse();
         log.info(">>>>>>>>>>>>>>>登记病例");
         baseResponse.setErrormsg("");
-        LymsPatient patient2 = lymsPatientService.getOne(Wrappers.query(patient).eq("idno", patient.getIdno()));
+        LymsPatient tmpP=new LymsPatient();
+        tmpP.setIdno(patient.getIdno());
+        LymsPatient patient2 = lymsPatientService.getOne(Wrappers.query(tmpP).eq("idno", patient.getIdno()));
         if (patient2 == null) {
             patient.setCreatedtime(new Date());
             patient.setPpasswd(Constant.COMMON_PASSWD);
         } else {
             patient.setId(patient2.getId());
             patient.setUpdatedtime(new Date());
+            patient.setCcnt(patient2.getCcnt()+patient.getCcnt());
         }
 
         if (result.hasErrors()) {
@@ -686,8 +692,8 @@ public class PatientController {
     public BaseResponse getPatientByIdno(String idno){
         BaseResponse baseResponse=new BaseResponse();
         try {
-            PatientInfo patient=patientInfoService.getOne(new QueryWrapper<PatientInfo>().eq("idno", idno));
-            baseResponse.setObject(null==patient?null:patient);
+            List<PatientInfo> pLst=patientInfoService.list(new QueryWrapper<PatientInfo>().eq("idno", idno));
+            baseResponse.setObject(pLst.size()<1?null:pLst.get(0));
             baseResponse.setErrormsg("成功");
         } catch (Exception e) {
             baseResponse.setErrormsg("失败");